From ff272dc25fa154eb88ceac97d18f864745b91eae Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 25 May 2022 17:23:04 +0200 Subject: [PATCH 1/4] Bump react-native-gesture-handler to version 2.3.2 The package reference will be updated later on, once the PRs on the fork for updating the package are merged. --- package-lock.json | 6 +++--- .../android/react-native-bridge/build.gradle | 2 +- packages/react-native-editor/android/app/build.gradle | 2 +- packages/react-native-editor/ios/Podfile.lock | 4 ++-- packages/react-native-editor/package.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index d64c7fea35c22..27055b1785300 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18273,7 +18273,7 @@ "jsdom-jscore-rn": "git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800", "node-fetch": "^2.6.0", "react-native": "0.66.2", - "react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.2.0-wp-4/react-native-gesture-handler-2.2.0-wp-4.tgz", + "react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/wp-fork-2.3.2/react-native-gesture-handler-2.3.2-wp-1.tgz", "react-native-get-random-values": "1.4.0", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-hsv-color-picker": "https://raw.githubusercontent.com/wordpress-mobile/react-native-hsv-color-picker/v1.0.1-wp-2/react-native-hsv-color-picker-1.0.1-wp-2.tgz", @@ -50814,8 +50814,8 @@ } }, "react-native-gesture-handler": { - "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.2.0-wp-4/react-native-gesture-handler-2.2.0-wp-4.tgz", - "integrity": "sha512-3pHMTuMWAko1nFJYRRrdqjnEGmPKxPe7C/wRa4PZ+FCelqdXoomwMLp1Rw7q722MXpQbjxQsQplfgPL4X5KxvQ==", + "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/wp-fork-2.3.2/react-native-gesture-handler-2.3.2-wp-1.tgz", + "integrity": "sha512-X14upXetE1IvlK0FrFHXMK3UW9QDBA9f7I86Dv0yArpHURFWzY8pbyGFmkNSi+yPqGtlhkpXrxx33Ap6VzfnFA==", "requires": { "@egjs/hammerjs": "^2.0.17", "hoist-non-react-statics": "^3.3.0", diff --git a/packages/react-native-bridge/android/react-native-bridge/build.gradle b/packages/react-native-bridge/android/react-native-bridge/build.gradle index 6bfdc5ed45205..345dc4565ae7b 100644 --- a/packages/react-native-bridge/android/react-native-bridge/build.gradle +++ b/packages/react-native-bridge/android/react-native-bridge/build.gradle @@ -77,7 +77,7 @@ dependencies { implementation "org.wordpress-mobile:react-native-webview:${extractPackageVersion(packageJson, 'react-native-webview', 'dependencies')}" implementation "org.wordpress-mobile:react-native-clipboard:${extractPackageVersion(packageJson, '@react-native-clipboard/clipboard', 'dependencies')}" - implementation("com.github.wordpress-mobile:react-native-gesture-handler:${extractPackageVersion(packageJson, 'react-native-gesture-handler', 'dependencies')}", { + implementation("com.github.wordpress-mobile:react-native-gesture-handler:wp-fork-2.3.2-SNAPSHOT", { // Remove Reanimated transitive dependency as it's already defined here exclude group: 'com.github.wordpress-mobile', module: 'react-native-reanimated' }) diff --git a/packages/react-native-editor/android/app/build.gradle b/packages/react-native-editor/android/app/build.gradle index a0db66ad9f8e9..2b8d4e72fb3d1 100644 --- a/packages/react-native-editor/android/app/build.gradle +++ b/packages/react-native-editor/android/app/build.gradle @@ -193,7 +193,7 @@ dependencies { implementation "org.wordpress-mobile:react-native-webview:${extractPackageVersion(packageJson, 'react-native-webview', 'dependencies')}" implementation "org.wordpress-mobile:react-native-clipboard:${extractPackageVersion(packageJson, '@react-native-clipboard/clipboard', 'dependencies')}" - implementation("com.github.wordpress-mobile:react-native-gesture-handler:${extractPackageVersion(packageJson, 'react-native-gesture-handler', 'dependencies')}", { + implementation("com.github.wordpress-mobile:react-native-gesture-handler:wp-fork-2.3.2-SNAPSHOT", { // Remove Reanimated transitive dependency as it's already defined here exclude group: 'com.github.wordpress-mobile', module: 'react-native-reanimated' }) diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock index b2fd1726c2687..d52fc2eb38e0e 100644 --- a/packages/react-native-editor/ios/Podfile.lock +++ b/packages/react-native-editor/ios/Podfile.lock @@ -304,7 +304,7 @@ PODS: - React-Core - RNCMaskedView (0.2.6): - React-Core - - RNGestureHandler (2.2.0-wp-4): + - RNGestureHandler (2.3.2-wp-1): - React-Core - RNReanimated (2.4.1-wp-2): - DoubleConversion @@ -538,7 +538,7 @@ SPEC CHECKSUMS: ReactCommon: c0263c1a41509aeb94be3214fa7bc3b71eae5ef6 RNCClipboard: 99fc8ad669a376b756fbc8098ae2fd05c0ed0668 RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd - RNGestureHandler: 93b98c40b9419b1a82b008b513c182fe09288d1f + RNGestureHandler: 3b13cc25407d1cdbee33b6ae65790a55c032d2a9 RNReanimated: d87c75f1076bab3402d6cd0b7322be51d333d10e RNScreens: 953633729a42e23ad0c93574d676b361e3335e8b RNSVG: 36a7359c428dcb7c6bce1cc546fbfebe069809b0 diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index 706c368919e23..e56fde6464139 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -57,7 +57,7 @@ "jsdom-jscore-rn": "git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800", "node-fetch": "^2.6.0", "react-native": "0.66.2", - "react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.2.0-wp-4/react-native-gesture-handler-2.2.0-wp-4.tgz", + "react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/wp-fork-2.3.2/react-native-gesture-handler-2.3.2-wp-1.tgz", "react-native-get-random-values": "1.4.0", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-hsv-color-picker": "https://raw.githubusercontent.com/wordpress-mobile/react-native-hsv-color-picker/v1.0.1-wp-2/react-native-hsv-color-picker-1.0.1-wp-2.tgz", From 7cd69d6c48f7e86057b9e27e3456e2adba73a2eb Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 25 May 2022 17:25:09 +0200 Subject: [PATCH 2/4] Fix RNGestureHandlerPackage import in Android --- .../org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java | 2 +- .../app/src/main/java/com/gutenberg/MainApplication.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java index 86e5a6b63ce2f..3e4d06bcd935c 100644 --- a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java +++ b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java @@ -46,7 +46,7 @@ import org.linusu.RNGetRandomValuesPackage; import com.reactnativecommunity.webview.RNCWebViewPackage; import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView; -import com.swmansion.gesturehandler.react.RNGestureHandlerPackage; +import com.swmansion.gesturehandler.RNGestureHandlerPackage; import com.swmansion.reanimated.ReanimatedJSIModulePackage; import com.swmansion.reanimated.ReanimatedPackage; import com.swmansion.rnscreens.RNScreensPackage; diff --git a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java index d74315aba221a..b94e581a736cb 100644 --- a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java +++ b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java @@ -37,7 +37,7 @@ import com.facebook.react.shell.MainReactPackage; import com.facebook.soloader.SoLoader; import com.reactnativecommunity.webview.RNCWebViewPackage; -import com.swmansion.gesturehandler.react.RNGestureHandlerPackage; +import com.swmansion.gesturehandler.RNGestureHandlerPackage; import com.swmansion.reanimated.ReanimatedJSIModulePackage; import com.swmansion.reanimated.ReanimatedPackage; import com.swmansion.rnscreens.RNScreensPackage; From a634b82040de91f919ddbeada1f5516fe2d9da67 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 25 May 2022 17:51:34 +0200 Subject: [PATCH 3/4] Update block-mover test snapshot --- .../block-mover/test/__snapshots__/index.native.js.snap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/block-editor/src/components/block-mover/test/__snapshots__/index.native.js.snap b/packages/block-editor/src/components/block-mover/test/__snapshots__/index.native.js.snap index 79b79766caaa6..ec1b5b196d57b 100644 --- a/packages/block-editor/src/components/block-mover/test/__snapshots__/index.native.js.snap +++ b/packages/block-editor/src/components/block-mover/test/__snapshots__/index.native.js.snap @@ -35,6 +35,8 @@ Array [ > Date: Wed, 25 May 2022 18:17:12 +0200 Subject: [PATCH 4/4] Update react-native-gesture-handler package to release version --- package-lock.json | 6 +++--- .../android/react-native-bridge/build.gradle | 2 +- packages/react-native-editor/android/app/build.gradle | 2 +- packages/react-native-editor/package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 27055b1785300..612d559cb66f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18273,7 +18273,7 @@ "jsdom-jscore-rn": "git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800", "node-fetch": "^2.6.0", "react-native": "0.66.2", - "react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/wp-fork-2.3.2/react-native-gesture-handler-2.3.2-wp-1.tgz", + "react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.3.2-wp-1/react-native-gesture-handler-2.3.2-wp-1.tgz", "react-native-get-random-values": "1.4.0", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-hsv-color-picker": "https://raw.githubusercontent.com/wordpress-mobile/react-native-hsv-color-picker/v1.0.1-wp-2/react-native-hsv-color-picker-1.0.1-wp-2.tgz", @@ -50814,8 +50814,8 @@ } }, "react-native-gesture-handler": { - "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/wp-fork-2.3.2/react-native-gesture-handler-2.3.2-wp-1.tgz", - "integrity": "sha512-X14upXetE1IvlK0FrFHXMK3UW9QDBA9f7I86Dv0yArpHURFWzY8pbyGFmkNSi+yPqGtlhkpXrxx33Ap6VzfnFA==", + "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.3.2-wp-1/react-native-gesture-handler-2.3.2-wp-1.tgz", + "integrity": "sha512-XKwFyoU2rsyQVVK9DhygNUsSipHBbqc5o/P/3davbRF81T7uPHwnTf/9X3Jze4eIwfiZmnRLz9rFgVxvK/1JyA==", "requires": { "@egjs/hammerjs": "^2.0.17", "hoist-non-react-statics": "^3.3.0", diff --git a/packages/react-native-bridge/android/react-native-bridge/build.gradle b/packages/react-native-bridge/android/react-native-bridge/build.gradle index 345dc4565ae7b..6bfdc5ed45205 100644 --- a/packages/react-native-bridge/android/react-native-bridge/build.gradle +++ b/packages/react-native-bridge/android/react-native-bridge/build.gradle @@ -77,7 +77,7 @@ dependencies { implementation "org.wordpress-mobile:react-native-webview:${extractPackageVersion(packageJson, 'react-native-webview', 'dependencies')}" implementation "org.wordpress-mobile:react-native-clipboard:${extractPackageVersion(packageJson, '@react-native-clipboard/clipboard', 'dependencies')}" - implementation("com.github.wordpress-mobile:react-native-gesture-handler:wp-fork-2.3.2-SNAPSHOT", { + implementation("com.github.wordpress-mobile:react-native-gesture-handler:${extractPackageVersion(packageJson, 'react-native-gesture-handler', 'dependencies')}", { // Remove Reanimated transitive dependency as it's already defined here exclude group: 'com.github.wordpress-mobile', module: 'react-native-reanimated' }) diff --git a/packages/react-native-editor/android/app/build.gradle b/packages/react-native-editor/android/app/build.gradle index 2b8d4e72fb3d1..a0db66ad9f8e9 100644 --- a/packages/react-native-editor/android/app/build.gradle +++ b/packages/react-native-editor/android/app/build.gradle @@ -193,7 +193,7 @@ dependencies { implementation "org.wordpress-mobile:react-native-webview:${extractPackageVersion(packageJson, 'react-native-webview', 'dependencies')}" implementation "org.wordpress-mobile:react-native-clipboard:${extractPackageVersion(packageJson, '@react-native-clipboard/clipboard', 'dependencies')}" - implementation("com.github.wordpress-mobile:react-native-gesture-handler:wp-fork-2.3.2-SNAPSHOT", { + implementation("com.github.wordpress-mobile:react-native-gesture-handler:${extractPackageVersion(packageJson, 'react-native-gesture-handler', 'dependencies')}", { // Remove Reanimated transitive dependency as it's already defined here exclude group: 'com.github.wordpress-mobile', module: 'react-native-reanimated' }) diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index e56fde6464139..3baf93616a9a7 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -57,7 +57,7 @@ "jsdom-jscore-rn": "git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800", "node-fetch": "^2.6.0", "react-native": "0.66.2", - "react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/wp-fork-2.3.2/react-native-gesture-handler-2.3.2-wp-1.tgz", + "react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.3.2-wp-1/react-native-gesture-handler-2.3.2-wp-1.tgz", "react-native-get-random-values": "1.4.0", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-hsv-color-picker": "https://raw.githubusercontent.com/wordpress-mobile/react-native-hsv-color-picker/v1.0.1-wp-2/react-native-hsv-color-picker-1.0.1-wp-2.tgz",