diff --git a/android/build.gradle b/android/build.gradle index f79be23..72d1e59 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -23,7 +23,15 @@ buildscript { } } +def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim()) + allprojects { + configurations.all { + resolutionStrategy { + force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION + } + } + repositories { mavenLocal() maven { diff --git a/package-lock.json b/package-lock.json index ddf0554..4014882 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,9 +32,9 @@ "react-native-localization": "^2.3.1", "react-native-progress": "^4.0.3", "react-native-push-notification": "^3.5.2", - "react-native-reanimated": "^2.2.0", + "react-native-reanimated": "2.2.0", "react-native-safe-area-context": "^3.2.0", - "react-native-screens": "^3.4.0", + "react-native-screens": "3.4.0", "react-native-side-menu-updated": "^1.3.2", "react-native-splash-screen": "^3.2.0", "react-native-vector-icons": "^6.6.0", @@ -10577,7 +10577,8 @@ "node_modules/lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" + "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", + "dev": true }, "node_modules/lodash.kebabcase": { "version": "4.1.1", @@ -11326,6 +11327,11 @@ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, + "node_modules/mockdate": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz", + "integrity": "sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==" + }, "node_modules/moment": { "version": "2.29.4", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", @@ -12478,17 +12484,6 @@ "ws": "^7" } }, - "node_modules/react-freeze": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.3.tgz", - "integrity": "sha512-ZnXwLQnGzrDpHBHiC56TXFXvmolPeMjTn1UOm610M4EXGzbEDR7oOIyS2ZiItgbs6eZc4oU/a0hpk8PrcKvv5g==", - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "react": ">=17.0.0" - } - }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -12748,22 +12743,19 @@ } }, "node_modules/react-native-reanimated": { - "version": "2.14.2", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.14.2.tgz", - "integrity": "sha512-zj05BBafk38rE78PhHc6q0vg9M4WeJY/RExHUGFiP1miJyyAaJzs2jLQR+HY0zbutCE+/yNJyOE3dca2BslsGg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.2.0.tgz", + "integrity": "sha512-lOJDd+5w1gY6DHGXG2jD1dsjzQmXQ2699HUc3IztvI2WP4zUT+UAA+zSG+5JiBS5DUnTL8YhhkmUQmr1KNGO5w==", "dependencies": { - "@babel/plugin-transform-object-assign": "^7.16.7", - "@babel/preset-typescript": "^7.16.7", - "convert-source-map": "^1.7.0", - "invariant": "^2.2.4", - "lodash.isequal": "^4.5.0", - "setimmediate": "^1.0.5", + "@babel/plugin-transform-object-assign": "^7.10.4", + "fbjs": "^3.0.0", + "mockdate": "^3.0.2", "string-hash-64": "^1.0.3" }, "peerDependencies": { - "@babel/core": "^7.0.0-0", "react": "*", - "react-native": "*" + "react-native": "*", + "react-native-gesture-handler": "*" } }, "node_modules/react-native-safe-area-context": { @@ -12776,11 +12768,10 @@ } }, "node_modules/react-native-screens": { - "version": "3.19.0", - "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.19.0.tgz", - "integrity": "sha512-Ehsmy7jr3H3j5pmN+/FqsAaIAD+k+xkcdePfLcg4rYRbN5X7fJPgaqhcmiCcZ0YxsU8ttsstP9IvRLNQuIkRRA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.4.0.tgz", + "integrity": "sha512-cg+q9MRnVdeOcJyvJtqffoXLur/C2wHA/7IO2+FAipzTlgHbbM1mTuSM7qG+SeiQjoIs4mHOEf7A0ziPKW04sA==", "dependencies": { - "react-freeze": "^1.0.0", "warn-once": "^0.1.0" }, "peerDependencies": { @@ -23764,7 +23755,8 @@ "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" + "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", + "dev": true }, "lodash.kebabcase": { "version": "4.1.1", @@ -24406,6 +24398,11 @@ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, + "mockdate": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz", + "integrity": "sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==" + }, "moment": { "version": "2.29.4", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", @@ -25262,12 +25259,6 @@ "ws": "^7" } }, - "react-freeze": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.3.tgz", - "integrity": "sha512-ZnXwLQnGzrDpHBHiC56TXFXvmolPeMjTn1UOm610M4EXGzbEDR7oOIyS2ZiItgbs6eZc4oU/a0hpk8PrcKvv5g==", - "requires": {} - }, "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -25483,16 +25474,13 @@ } }, "react-native-reanimated": { - "version": "2.14.2", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.14.2.tgz", - "integrity": "sha512-zj05BBafk38rE78PhHc6q0vg9M4WeJY/RExHUGFiP1miJyyAaJzs2jLQR+HY0zbutCE+/yNJyOE3dca2BslsGg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.2.0.tgz", + "integrity": "sha512-lOJDd+5w1gY6DHGXG2jD1dsjzQmXQ2699HUc3IztvI2WP4zUT+UAA+zSG+5JiBS5DUnTL8YhhkmUQmr1KNGO5w==", "requires": { - "@babel/plugin-transform-object-assign": "^7.16.7", - "@babel/preset-typescript": "^7.16.7", - "convert-source-map": "^1.7.0", - "invariant": "^2.2.4", - "lodash.isequal": "^4.5.0", - "setimmediate": "^1.0.5", + "@babel/plugin-transform-object-assign": "^7.10.4", + "fbjs": "^3.0.0", + "mockdate": "^3.0.2", "string-hash-64": "^1.0.3" } }, @@ -25503,11 +25491,10 @@ "requires": {} }, "react-native-screens": { - "version": "3.19.0", - "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.19.0.tgz", - "integrity": "sha512-Ehsmy7jr3H3j5pmN+/FqsAaIAD+k+xkcdePfLcg4rYRbN5X7fJPgaqhcmiCcZ0YxsU8ttsstP9IvRLNQuIkRRA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.4.0.tgz", + "integrity": "sha512-cg+q9MRnVdeOcJyvJtqffoXLur/C2wHA/7IO2+FAipzTlgHbbM1mTuSM7qG+SeiQjoIs4mHOEf7A0ziPKW04sA==", "requires": { - "react-freeze": "^1.0.0", "warn-once": "^0.1.0" } }, diff --git a/package.json b/package.json index 723d58b..30ac3f9 100644 --- a/package.json +++ b/package.json @@ -35,9 +35,9 @@ "react-native-localization": "^2.3.1", "react-native-progress": "^4.0.3", "react-native-push-notification": "^3.5.2", - "react-native-reanimated": "^2.2.0", + "react-native-reanimated": "2.2.0", "react-native-safe-area-context": "^3.2.0", - "react-native-screens": "^3.4.0", + "react-native-screens": "3.4.0", "react-native-side-menu-updated": "^1.3.2", "react-native-splash-screen": "^3.2.0", "react-native-vector-icons": "^6.6.0",