Skip to content

Commit 98c628a

Browse files
Kwasowpiaskowyk
authored andcommitted
Bumped gesture-handler and screens dependencies (#3468)
* Bumped react-native-screens to 3.15.0 * Bumped react-native-gesture-handler to 2.5.0 * Updated workflows to include changes to example apps
1 parent 8b609b1 commit 98c628a

File tree

7 files changed

+22
-64
lines changed

7 files changed

+22
-64
lines changed

.github/workflows/android-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
paths:
77
- 'android/**'
88
- 'Common/**'
9+
- 'FabricExample/package.json'
10+
- 'Example/package.json'
911
push:
1012
branches:
1113
- main

.github/workflows/ios-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
paths:
77
- 'ios/**'
88
- 'Common/**'
9+
- 'FabricExample/package.json'
10+
- 'Example/package.json'
911
push:
1012
branches:
1113
- main
Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
package com.swmansion.reanimated.example;
22

3-
import android.util.Log;
4-
53
import com.facebook.react.ReactActivity;
6-
import com.facebook.react.ReactActivityDelegate;
7-
import com.facebook.react.ReactInstanceManager;
8-
import com.facebook.react.ReactRootView;
9-
10-
import com.facebook.react.bridge.ReactContext;
11-
import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
12-
import com.swmansion.reanimated.NativeProxy;
134

145
public class MainActivity extends ReactActivity {
156

@@ -18,17 +9,6 @@ protected String getMainComponentName() {
189
return "ReanimatedExample";
1910
}
2011

21-
// Add the following method to your main activity class
22-
@Override
23-
protected ReactActivityDelegate createReactActivityDelegate() {
24-
return new ReactActivityDelegate(this, getMainComponentName()) {
25-
@Override
26-
protected ReactRootView createRootView() {
27-
return new RNGestureHandlerEnabledRootView(MainActivity.this);
28-
}
29-
};
30-
}
31-
3212
public native String getString();
3313

3414
}

Example/android/app/src/main/java/com/swmansion/reanimated/example/MainApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import com.facebook.react.ReactApplication;
77
import com.reactnativecommunity.picker.RNCPickerPackage;
8+
import com.swmansion.gesturehandler.RNGestureHandlerPackage;
89
import com.swmansion.rnscreens.RNScreensPackage;
910
import com.th3rdwave.safeareacontext.SafeAreaContextPackage;
1011
import com.facebook.react.ReactInstanceManager;
@@ -14,7 +15,6 @@
1415
import com.facebook.soloader.SoLoader;
1516
import com.horcrux.svg.SvgPackage;
1617
import com.reactnativepagerview.PagerViewPackage;
17-
import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
1818
import com.swmansion.reanimated.ReanimatedPackage;
1919

2020
import org.reactnative.maskedview.RNCMaskedViewPackage;

Example/ios/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ PODS:
327327
- React
328328
- RNCPicker (1.8.1):
329329
- React-Core
330-
- RNGestureHandler (1.10.1):
330+
- RNGestureHandler (2.5.0):
331331
- React-Core
332332
- RNReanimated (2.9.1):
333333
- DoubleConversion
@@ -510,7 +510,7 @@ SPEC CHECKSUMS:
510510
FBLazyVector: 0cab5b1620c2810b4a2a814e4d9490c480e35917
511511
FBReactNativeSpec: 0b6e1cbcc2f1c4a47d03f8ab9961759d0f644c05
512512
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
513-
glog: 476ee3e89abb49e07f822b48323c51c57124b572
513+
glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
514514
hermes-engine: 83648c4de4acf97aacf1f68d457b1b6bb015388c
515515
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
516516
RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
@@ -545,8 +545,8 @@ SPEC CHECKSUMS:
545545
ReactCommon: e192c52229a978dc7ab7bfb21aa38c686005db31
546546
RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
547547
RNCPicker: 914b557e20b3b8317b084aca9ff4b4edb95f61e4
548-
RNGestureHandler: 5e58135436aacc1c5d29b75547d3d2b9430d052c
549-
RNReanimated: 69007d9ff097c9ca38836894e1fc9aa619701c6d
548+
RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
549+
RNReanimated: 2c54cf0072b49ae4ae0d46ac8930394699ed3667
550550
RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
551551
RNSVG: ce9d996113475209013317e48b05c21ee988d42e
552552
Yoga: f2aa7bc41e39cbf8edc0251a86fa89193b51491b

Example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"react": "18.1.0",
3939
"react-dom": "^16.13.1",
4040
"react-native": "0.70.0-rc.2",
41-
"react-native-gesture-handler": "^1.10.1",
41+
"react-native-gesture-handler": "^2.5.0",
4242
"react-native-pager-view": "^5.4.1",
4343
"react-native-safe-area-context": "^3.1.9",
4444
"react-native-screens": "^3.15.0",

Example/yarn.lock

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4251,11 +4251,6 @@
42514251
resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.36.tgz#17ce0a235e9ffbcdcdf5095646b374c2bf615a4c"
42524252
integrity sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ==
42534253

4254-
"@types/hammerjs@^2.0.38":
4255-
version "2.0.38"
4256-
resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.38.tgz#44fdab66fb960fc7002f4a9e54d91545f0bf9448"
4257-
integrity sha512-wuwDzWW1JWh3BZoRftBlKcctjNzR75QFY4/b4zAz7sH1EesA8HBJzke+bF5dxCATNdHHs3X1P5UWanbbUT6chw==
4258-
42594254
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
42604255
version "2.0.1"
42614256
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -5537,13 +5532,6 @@ create-react-class@^15.6.2:
55375532
loose-envify "^1.3.1"
55385533
object-assign "^4.1.1"
55395534

5540-
cross-fetch@^3.0.4:
5541-
version "3.1.5"
5542-
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
5543-
integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
5544-
dependencies:
5545-
node-fetch "2.6.7"
5546-
55475535
cross-spawn@^4.0.2:
55485536
version "4.0.2"
55495537
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
@@ -6599,19 +6587,6 @@ fbjs@^1.0.0:
65996587
setimmediate "^1.0.5"
66006588
ua-parser-js "^0.7.18"
66016589

6602-
fbjs@^3.0.0:
6603-
version "3.0.0"
6604-
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.0.tgz#0907067fb3f57a78f45d95f1eacffcacd623c165"
6605-
integrity sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==
6606-
dependencies:
6607-
cross-fetch "^3.0.4"
6608-
fbjs-css-vars "^1.0.0"
6609-
loose-envify "^1.0.0"
6610-
object-assign "^4.1.0"
6611-
promise "^7.1.1"
6612-
setimmediate "^1.0.5"
6613-
ua-parser-js "^0.7.18"
6614-
66156590
file-entry-cache@^6.0.1:
66166591
version "6.0.1"
66176592
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -9403,20 +9378,20 @@ node-dir@^0.1.17:
94039378
dependencies:
94049379
minimatch "^3.0.2"
94059380

9406-
node-fetch@2.6.7, node-fetch@^2.2.0, node-fetch@^2.6.0:
9407-
version "2.6.7"
9408-
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
9409-
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
9410-
dependencies:
9411-
whatwg-url "^5.0.0"
9412-
94139381
node-fetch@^1.0.1:
94149382
version "1.7.3"
94159383
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
94169384
dependencies:
94179385
encoding "^0.1.11"
94189386
is-stream "^1.0.1"
94199387

9388+
node-fetch@^2.2.0, node-fetch@^2.6.0:
9389+
version "2.6.7"
9390+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
9391+
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
9392+
dependencies:
9393+
whatwg-url "^5.0.0"
9394+
94209395
node-int64@^0.4.0:
94219396
version "0.4.0"
94229397
resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -10216,16 +10191,15 @@ react-native-codegen@^0.70.3:
1021610191
jscodeshift "^0.13.1"
1021710192
nullthrows "^1.1.1"
1021810193

10219-
react-native-gesture-handler@^1.10.1:
10220-
version "1.10.1"
10221-
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.10.1.tgz#e7a93a5bc516338bc24a57b3312043dc00489377"
10222-
integrity sha512-sDo6T0m+izIDczsIzE63nAqEG3BE/OwkCJoU4/qjdo7ryem7D0Rj/Y+SlAZP2lVAhllo65LDRYqd6SBe4y19Mg==
10194+
react-native-gesture-handler@^2.5.0:
10195+
version "2.5.0"
10196+
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.5.0.tgz#61385583570ed0a45a9ed142425e35f8fe8274fb"
10197+
integrity sha512-djZdcprFf08PZC332D+AeG5wcGeAPhzfCJtB3otUgOgTlvjVXmg/SLFdPJSpzLBqkRAmrC77tM79QgKbuLxkfw==
1022310198
dependencies:
1022410199
"@egjs/hammerjs" "^2.0.17"
10225-
"@types/hammerjs" "^2.0.38"
10226-
fbjs "^3.0.0"
1022710200
hoist-non-react-statics "^3.3.0"
1022810201
invariant "^2.2.4"
10202+
lodash "^4.17.21"
1022910203
prop-types "^15.7.2"
1023010204

1023110205
react-native-gradle-plugin@^0.0.4:

0 commit comments

Comments
 (0)