diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java index 8d9214cf77..1ffb90c6bc 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java @@ -124,7 +124,7 @@ class ReactInstanceManagerHolder { new com.reactnativecommunity.webview.RNCWebViewPackage(), new com.kevinresol.react_native_default_preference.RNDefaultPreferencePackage(), new com.learnium.RNDeviceInfo.RNDeviceInfo(), - new com.swmansion.gesturehandler.react.RNGestureHandlerPackage(), + new com.swmansion.gesturehandler.RNGestureHandlerPackage(), new org.linusu.RNGetRandomValuesPackage(), new com.rnimmersive.RNImmersivePackage(), new com.swmansion.rnscreens.RNScreensPackage(), diff --git a/ios/Podfile.lock b/ios/Podfile.lock index aa0e3f1cf3..095a1ac5d6 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -467,7 +467,7 @@ PODS: - React-Core - RNDeviceInfo (8.4.8): - React-Core - - RNGestureHandler (2.1.0): + - RNGestureHandler (2.8.0): - React-Core - RNGoogleSignin (7.0.4): - GoogleSignIn (~> 6.0.0) @@ -775,7 +775,7 @@ SPEC CHECKSUMS: RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd RNDefaultPreference: 08bdb06cfa9188d5da97d4642dac745218d7fb31 RNDeviceInfo: 0400a6d0c94186d1120c3cbd97b23abc022187a9 - RNGestureHandler: e5c7cab5f214503dcefd6b2b0cefb050e1f51c4a + RNGestureHandler: 62232ba8f562f7dea5ba1b3383494eb5bf97a4d3 RNGoogleSignin: c4381751eefd73c552b923ba347a9bfc6f18771c RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19 RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f diff --git a/package-lock.json b/package-lock.json index 8133752205..c2463fa7d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -96,7 +96,7 @@ "react-native-default-preference": "1.4.4", "react-native-device-info": "8.4.8", "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz", - "react-native-gesture-handler": "2.1.0", + "react-native-gesture-handler": "2.8.0", "react-native-get-random-values": "1.7.2", "react-native-immersive": "2.0.0", "react-native-keep-awake": "4.0.0", @@ -16246,15 +16246,19 @@ } }, "node_modules/react-native-gesture-handler": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.1.0.tgz", - "integrity": "sha512-vF4yEUrV5GMBioTkvf5Le1l3N/52dSLBnNMFC+kZ4hssnRoXB0hEQ0ReUkZckRB5L3nbHBhAyjySEtFPx4nyEA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.8.0.tgz", + "integrity": "sha512-poOSfz/w0IyD6Qwq7aaIRRfEaVTl1ecQFoyiIbpOpfNTjm2B1niY2FLrdVQIOtIOe+K9nH55Qal04nr4jGkHdQ==", "dependencies": { "@egjs/hammerjs": "^2.0.17", "hoist-non-react-statics": "^3.3.0", "invariant": "^2.2.4", "lodash": "^4.17.21", "prop-types": "^15.7.2" + }, + "peerDependencies": { + "react": "*", + "react-native": "*" } }, "node_modules/react-native-get-random-values": { @@ -32610,9 +32614,9 @@ "integrity": "sha512-MKbuBbovO8eGiAM9i6o0nrdBXivhRpzPQ+aVBXGJEPMH7RrCSNUKaCoEpkjfGHlTxjZimi6WjDCjjzCRSHlV1A==" }, "react-native-gesture-handler": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.1.0.tgz", - "integrity": "sha512-vF4yEUrV5GMBioTkvf5Le1l3N/52dSLBnNMFC+kZ4hssnRoXB0hEQ0ReUkZckRB5L3nbHBhAyjySEtFPx4nyEA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.8.0.tgz", + "integrity": "sha512-poOSfz/w0IyD6Qwq7aaIRRfEaVTl1ecQFoyiIbpOpfNTjm2B1niY2FLrdVQIOtIOe+K9nH55Qal04nr4jGkHdQ==", "requires": { "@egjs/hammerjs": "^2.0.17", "hoist-non-react-statics": "^3.3.0", diff --git a/package.json b/package.json index 0a431f445a..89b09e35b6 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "react-native-default-preference": "1.4.4", "react-native-device-info": "8.4.8", "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz", - "react-native-gesture-handler": "2.1.0", + "react-native-gesture-handler": "2.8.0", "react-native-get-random-values": "1.7.2", "react-native-immersive": "2.0.0", "react-native-keep-awake": "4.0.0", diff --git a/patches/react-native-gesture-handler+2.1.0.patch b/patches/react-native-gesture-handler+2.1.0.patch deleted file mode 100644 index 65e4a8f159..0000000000 --- a/patches/react-native-gesture-handler+2.1.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/react-native-gesture-handler/android/build.gradle b/node_modules/react-native-gesture-handler/android/build.gradle -index 8afc3d5..4b1f721 100644 ---- a/node_modules/react-native-gesture-handler/android/build.gradle -+++ b/node_modules/react-native-gesture-handler/android/build.gradle -@@ -26,7 +26,7 @@ def shouldUseCommonInterfaceFromReanimated() { - def json = new JsonSlurper().parseText(inputFile.text) - def reanimatedVersion = json.version as String - def (major, minor, patch) = reanimatedVersion.tokenize('.') -- return Integer.parseInt(minor) >= 3 -+ return Integer.parseInt(major) >= 2 && Integer.parseInt(minor) >= 3 - } else { - return false - }