Skip to content

Commit 6b59b1e

Browse files
committed
deps: Upgrade react-native-gesture-handler
This is needed in order to bump compileSdkVersion to 33 without hitting this build error: software-mansion/react-native-gesture-handler#2096 The upgrade requires a change in our Android MainActivity class, like so: https://docs.swmansion.com/react-native-gesture-handler/docs/guides/migrating-off-rnghenabledroot/
1 parent a9e2e03 commit 6b59b1e

File tree

4 files changed

+7
-19
lines changed

4 files changed

+7
-19
lines changed

android/app/src/main/java/com/zulipmobile/MainActivity.kt

-12
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.facebook.react.ReactActivityDelegate
88
import com.facebook.react.ReactApplication
99
import com.facebook.react.ReactRootView
1010
import com.facebook.react.bridge.ReactContext
11-
import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView
1211
import com.zulipmobile.notifications.*
1312
import com.zulipmobile.sharing.handleSend
1413
import expo.modules.ReactActivityDelegateWrapper
@@ -35,17 +34,6 @@ open class MainActivity : ReactActivity() {
3534
return "ZulipMobile"
3635
}
3736

38-
override fun createReactActivityDelegate(): ReactActivityDelegate {
39-
return ReactActivityDelegateWrapper(
40-
this,
41-
object : ReactActivityDelegate(this, mainComponentName) {
42-
override fun createRootView(): ReactRootView {
43-
return RNGestureHandlerEnabledRootView(this@MainActivity)
44-
}
45-
}
46-
)
47-
}
48-
4937
/* Returns true just if we did handle the intent. */
5038
private fun maybeHandleIntent(intent: Intent?): Boolean {
5139
intent ?: return false

ios/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ PODS:
392392
- React-Core
393393
- RNDeviceInfo (8.7.1):
394394
- React-Core
395-
- RNGestureHandler (2.1.3):
395+
- RNGestureHandler (2.8.0):
396396
- React-Core
397397
- RNReanimated (2.2.4):
398398
- DoubleConversion
@@ -730,7 +730,7 @@ SPEC CHECKSUMS:
730730
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
731731
RNCPushNotificationIOS: 87b8d16d3ede4532745e05b03c42cff33a36cc45
732732
RNDeviceInfo: aad3c663b25752a52bf8fce93f2354001dd185aa
733-
RNGestureHandler: e1099204721a17a89c81fcd1cc2e92143dc040fb
733+
RNGestureHandler: 62232ba8f562f7dea5ba1b3383494eb5bf97a4d3
734734
RNReanimated: e28dfaa950064b674fde0a9b736e62b9dff500a7
735735
RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
736736
RNSentry: 85f6525b5fe8d2ada065858026b338605b3c09da

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"react-native": "0.67.4",
5858
"react-native-device-info": "^8.1.7",
5959
"react-native-document-picker": "^3.2.4",
60-
"react-native-gesture-handler": "~2.1.0",
60+
"react-native-gesture-handler": "^2.8.0",
6161
"react-native-image-picker": "^4.1.1",
6262
"react-native-photo-view": "alwx/react-native-photo-view#c58fd6b30",
6363
"react-native-reanimated": "^2.2.0 <2.3.0",

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -13477,10 +13477,10 @@ react-native-document-picker@^3.2.4:
1347713477
resolved "https://registry.yarnpkg.com/react-native-document-picker/-/react-native-document-picker-3.5.4.tgz#4b9f261ea0d52e91d571670caaf55923ceb80f5f"
1347813478
integrity sha512-ZKGAa8ztQ7zA1eE95OCiNsI/Q6fiq1Q3es8MyOEakBkWcX9avWNYaJUrbv/8v80Vo4RzcNxsO3wT6a2hgfpz7A==
1347913479

13480-
react-native-gesture-handler@~2.1.0:
13481-
version "2.1.3"
13482-
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.1.3.tgz#b96f1e61932d5062cb1023259e1649d65f78338b"
13483-
integrity sha512-y5W2MVB+J6vjIT/mUidDv0BqVRbWXn0cP7R2o6fsSYsHh9M0btT979+bCI7nPuhmRHjkhg5xCm4HNMIH0IQO4w==
13480+
react-native-gesture-handler@^2.8.0:
13481+
version "2.8.0"
13482+
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.8.0.tgz#ef9857871c10663c95a51546225b6e00cd4740cf"
13483+
integrity sha512-poOSfz/w0IyD6Qwq7aaIRRfEaVTl1ecQFoyiIbpOpfNTjm2B1niY2FLrdVQIOtIOe+K9nH55Qal04nr4jGkHdQ==
1348413484
dependencies:
1348513485
"@egjs/hammerjs" "^2.0.17"
1348613486
hoist-non-react-statics "^3.3.0"

0 commit comments

Comments
 (0)