diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 72d64a7bd70..7136985359f 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -6,6 +6,8 @@ on: paths: - 'android/**' - 'Common/**' + - 'FabricExample/package.json' + - 'Example/package.json' push: branches: - main diff --git a/.github/workflows/ios-build.yml b/.github/workflows/ios-build.yml index 3edcd0c9df6..5651bf09faa 100644 --- a/.github/workflows/ios-build.yml +++ b/.github/workflows/ios-build.yml @@ -6,6 +6,8 @@ on: paths: - 'ios/**' - 'Common/**' + - 'FabricExample/package.json' + - 'Example/package.json' push: branches: - main diff --git a/Example/android/app/src/main/java/com/swmansion/reanimated/example/MainActivity.java b/Example/android/app/src/main/java/com/swmansion/reanimated/example/MainActivity.java index a824d6fc2ab..9580d4caa0b 100644 --- a/Example/android/app/src/main/java/com/swmansion/reanimated/example/MainActivity.java +++ b/Example/android/app/src/main/java/com/swmansion/reanimated/example/MainActivity.java @@ -1,15 +1,6 @@ package com.swmansion.reanimated.example; -import android.util.Log; - import com.facebook.react.ReactActivity; -import com.facebook.react.ReactActivityDelegate; -import com.facebook.react.ReactInstanceManager; -import com.facebook.react.ReactRootView; - -import com.facebook.react.bridge.ReactContext; -import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView; -import com.swmansion.reanimated.NativeProxy; public class MainActivity extends ReactActivity { @@ -18,17 +9,6 @@ protected String getMainComponentName() { return "ReanimatedExample"; } - // Add the following method to your main activity class - @Override - protected ReactActivityDelegate createReactActivityDelegate() { - return new ReactActivityDelegate(this, getMainComponentName()) { - @Override - protected ReactRootView createRootView() { - return new RNGestureHandlerEnabledRootView(MainActivity.this); - } - }; - } - public native String getString(); } diff --git a/Example/android/app/src/main/java/com/swmansion/reanimated/example/MainApplication.java b/Example/android/app/src/main/java/com/swmansion/reanimated/example/MainApplication.java index 06828081ad5..924693452c3 100644 --- a/Example/android/app/src/main/java/com/swmansion/reanimated/example/MainApplication.java +++ b/Example/android/app/src/main/java/com/swmansion/reanimated/example/MainApplication.java @@ -5,6 +5,7 @@ import com.facebook.react.ReactApplication; import com.reactnativecommunity.picker.RNCPickerPackage; +import com.swmansion.gesturehandler.RNGestureHandlerPackage; import com.swmansion.rnscreens.RNScreensPackage; import com.th3rdwave.safeareacontext.SafeAreaContextPackage; import com.facebook.react.ReactInstanceManager; @@ -14,7 +15,6 @@ import com.facebook.soloader.SoLoader; import com.horcrux.svg.SvgPackage; import com.reactnativepagerview.PagerViewPackage; -import com.swmansion.gesturehandler.react.RNGestureHandlerPackage; import com.swmansion.reanimated.ReanimatedPackage; import org.reactnative.maskedview.RNCMaskedViewPackage; diff --git a/Example/ios/Podfile.lock b/Example/ios/Podfile.lock index 8aacaf9d334..7b52a64c5b9 100644 --- a/Example/ios/Podfile.lock +++ b/Example/ios/Podfile.lock @@ -327,7 +327,7 @@ PODS: - React - RNCPicker (1.8.1): - React-Core - - RNGestureHandler (1.10.1): + - RNGestureHandler (2.5.0): - React-Core - RNReanimated (2.9.1): - DoubleConversion @@ -510,7 +510,7 @@ SPEC CHECKSUMS: FBLazyVector: 0cab5b1620c2810b4a2a814e4d9490c480e35917 FBReactNativeSpec: 0b6e1cbcc2f1c4a47d03f8ab9961759d0f644c05 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 476ee3e89abb49e07f822b48323c51c57124b572 + glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a hermes-engine: 83648c4de4acf97aacf1f68d457b1b6bb015388c libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda @@ -545,8 +545,8 @@ SPEC CHECKSUMS: ReactCommon: e192c52229a978dc7ab7bfb21aa38c686005db31 RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f RNCPicker: 914b557e20b3b8317b084aca9ff4b4edb95f61e4 - RNGestureHandler: 5e58135436aacc1c5d29b75547d3d2b9430d052c - RNReanimated: 69007d9ff097c9ca38836894e1fc9aa619701c6d + RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50 + RNReanimated: 2c54cf0072b49ae4ae0d46ac8930394699ed3667 RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7 RNSVG: ce9d996113475209013317e48b05c21ee988d42e Yoga: f2aa7bc41e39cbf8edc0251a86fa89193b51491b diff --git a/Example/package.json b/Example/package.json index 01cac02bdc0..c7cae06804c 100644 --- a/Example/package.json +++ b/Example/package.json @@ -38,7 +38,7 @@ "react": "18.1.0", "react-dom": "^16.13.1", "react-native": "0.70.0-rc.2", - "react-native-gesture-handler": "^1.10.1", + "react-native-gesture-handler": "^2.5.0", "react-native-pager-view": "^5.4.1", "react-native-safe-area-context": "^3.1.9", "react-native-screens": "^3.15.0", diff --git a/Example/yarn.lock b/Example/yarn.lock index e8d4d4addc6..bc0df5a5b54 100644 --- a/Example/yarn.lock +++ b/Example/yarn.lock @@ -4251,11 +4251,6 @@ resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.36.tgz#17ce0a235e9ffbcdcdf5095646b374c2bf615a4c" integrity sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ== -"@types/hammerjs@^2.0.38": - version "2.0.38" - resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.38.tgz#44fdab66fb960fc7002f4a9e54d91545f0bf9448" - integrity sha512-wuwDzWW1JWh3BZoRftBlKcctjNzR75QFY4/b4zAz7sH1EesA8HBJzke+bF5dxCATNdHHs3X1P5UWanbbUT6chw== - "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": version "2.0.1" 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: loose-envify "^1.3.1" object-assign "^4.1.1" -cross-fetch@^3.0.4: - version "3.1.5" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" - integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== - dependencies: - node-fetch "2.6.7" - cross-spawn@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" @@ -6599,19 +6587,6 @@ fbjs@^1.0.0: setimmediate "^1.0.5" ua-parser-js "^0.7.18" -fbjs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.0.tgz#0907067fb3f57a78f45d95f1eacffcacd623c165" - integrity sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg== - dependencies: - cross-fetch "^3.0.4" - fbjs-css-vars "^1.0.0" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.18" - file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -9403,13 +9378,6 @@ node-dir@^0.1.17: dependencies: minimatch "^3.0.2" -node-fetch@2.6.7, node-fetch@^2.2.0, node-fetch@^2.6.0: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== - dependencies: - whatwg-url "^5.0.0" - node-fetch@^1.0.1: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" @@ -9417,6 +9385,13 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" +node-fetch@^2.2.0, node-fetch@^2.6.0: + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== + dependencies: + whatwg-url "^5.0.0" + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -10216,16 +10191,15 @@ react-native-codegen@^0.70.3: jscodeshift "^0.13.1" nullthrows "^1.1.1" -react-native-gesture-handler@^1.10.1: - version "1.10.1" - resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.10.1.tgz#e7a93a5bc516338bc24a57b3312043dc00489377" - integrity sha512-sDo6T0m+izIDczsIzE63nAqEG3BE/OwkCJoU4/qjdo7ryem7D0Rj/Y+SlAZP2lVAhllo65LDRYqd6SBe4y19Mg== +react-native-gesture-handler@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.5.0.tgz#61385583570ed0a45a9ed142425e35f8fe8274fb" + integrity sha512-djZdcprFf08PZC332D+AeG5wcGeAPhzfCJtB3otUgOgTlvjVXmg/SLFdPJSpzLBqkRAmrC77tM79QgKbuLxkfw== dependencies: "@egjs/hammerjs" "^2.0.17" - "@types/hammerjs" "^2.0.38" - fbjs "^3.0.0" hoist-non-react-statics "^3.3.0" invariant "^2.2.4" + lodash "^4.17.21" prop-types "^15.7.2" react-native-gradle-plugin@^0.0.4: