From a3dea094ff9f62c1463449f009fb6e9b1bf4caad Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 30 Sep 2022 11:45:41 +0200 Subject: [PATCH 01/11] Upgrade compile and target sdk version to API 31 --- packages/react-native-aztec/android/build.gradle | 4 ++-- .../android/react-native-bridge/build.gradle | 4 ++-- packages/react-native-editor/android/build.gradle | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/react-native-aztec/android/build.gradle b/packages/react-native-aztec/android/build.gradle index 39383624f2bf71..3f81151b878dbf 100644 --- a/packages/react-native-aztec/android/build.gradle +++ b/packages/react-native-aztec/android/build.gradle @@ -34,11 +34,11 @@ List dirs = [ 'template'] // boilerplate code that is generated by the sample template process android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 31 } compileOptions { 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 6998e5cbdca53a..70f3d4c4307c98 100644 --- a/packages/react-native-bridge/android/react-native-bridge/build.gradle +++ b/packages/react-native-bridge/android/react-native-bridge/build.gradle @@ -14,11 +14,11 @@ group='org.wordpress-mobile.gutenberg-mobile' def buildAssetsFolder = 'build/assets' android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 31 buildConfigField "boolean", "SHOULD_ATTACH_JS_BUNDLE", willPublishReactNativeBridgeBinary.toString() } diff --git a/packages/react-native-editor/android/build.gradle b/packages/react-native-editor/android/build.gradle index 848c57073453a7..9e806673d38593 100644 --- a/packages/react-native-editor/android/build.gradle +++ b/packages/react-native-editor/android/build.gradle @@ -4,8 +4,8 @@ buildscript { kotlinVersion = '1.5.32' buildToolsVersion = "30.0.2" minSdkVersion = 21 - compileSdkVersion = 30 - targetSdkVersion = 30 + compileSdkVersion = 31 + targetSdkVersion = 31 supportLibVersion = '28.0.0' ndkVersion = "21.4.7075529" } From 958300daa6d05b0f209a855504ba40f302197159 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 30 Sep 2022 11:58:16 +0200 Subject: [PATCH 02/11] Enable component exporting for demo activity --- .../android/app/src/main/AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/react-native-editor/android/app/src/main/AndroidManifest.xml b/packages/react-native-editor/android/app/src/main/AndroidManifest.xml index 59178922a493f3..7323be781e80a9 100644 --- a/packages/react-native-editor/android/app/src/main/AndroidManifest.xml +++ b/packages/react-native-editor/android/app/src/main/AndroidManifest.xml @@ -17,7 +17,8 @@ android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> From de1fc7034aec3e0bf6f60f1761446a0f81dc1e7f Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 4 Oct 2022 18:40:22 +0200 Subject: [PATCH 03/11] [TEST] Point Android dependencies to snapshot version --- .../android/react-native-bridge/build.gradle | 12 ++++++------ .../react-native-editor/android/app/build.gradle | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) 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 70f3d4c4307c98..5fdceb593c2011 100644 --- a/packages/react-native-bridge/android/react-native-bridge/build.gradle +++ b/packages/react-native-bridge/android/react-native-bridge/build.gradle @@ -65,20 +65,20 @@ dependencies { implementation "com.facebook.react:react-native:$rnVersion" implementation "org.wordpress-mobile:react-native-svg:${extractPackageVersion(packageJson, 'react-native-svg', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-video:${extractPackageVersion(packageJson, 'react-native-video', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-linear-gradient:${extractPackageVersion(packageJson, 'react-native-linear-gradient', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-slider:${extractPackageVersion(packageJson, '@react-native-community/slider', 'dependencies')}" + implementation "com.github.wordpress-mobile:react-native-video:update~android-12-SNAPSHOT" + implementation "com.github.wordpress-mobile:react-native-linear-gradient:update~android-12-SNAPSHOT" + implementation "com.github.wordpress-mobile:react-native-slider:update~android-12-SNAPSHOT" implementation "org.wordpress-mobile:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}" implementation "org.wordpress-mobile:react-native-masked-view:${extractPackageVersion(packageJson, '@react-native-masked-view/masked-view', 'dependencies')}" implementation "org.wordpress-mobile:react-native-screens:${extractPackageVersion(packageJson, 'react-native-screens', 'dependencies')}" implementation "org.wordpress-mobile:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-reanimated:${extractPackageVersion(packageJson, 'react-native-reanimated', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-prompt-android:${extractPackageVersion(packageJson, 'react-native-prompt-android', 'dependencies')}" + implementation "com.github.wordpress-mobile:react-native-reanimated:update~android-12-1.9.0-g0ae9a17" + implementation "com.github.wordpress-mobile:react-native-prompt-android:update~android-12-SNAPSHOT" 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 "org.wordpress-mobile:react-native-fast-image:${extractPackageVersion(packageJson, 'react-native-fast-image', '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:update~android-12-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 e4b5d092724e26..8f42f5652fd8a1 100644 --- a/packages/react-native-editor/android/app/build.gradle +++ b/packages/react-native-editor/android/app/build.gradle @@ -182,20 +182,20 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" implementation "org.wordpress-mobile:react-native-svg:${extractPackageVersion(packageJson, 'react-native-svg', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-video:${extractPackageVersion(packageJson, 'react-native-video', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-linear-gradient:${extractPackageVersion(packageJson, 'react-native-linear-gradient', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-slider:${extractPackageVersion(packageJson, '@react-native-community/slider', 'dependencies')}" + implementation "com.github.wordpress-mobile:react-native-video:update~android-12-SNAPSHOT" + implementation "com.github.wordpress-mobile:react-native-linear-gradient:update~android-12-SNAPSHOT" + implementation "com.github.wordpress-mobile:react-native-slider:update~android-12-SNAPSHOT" implementation "org.wordpress-mobile:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}" implementation "org.wordpress-mobile:react-native-masked-view:${extractPackageVersion(packageJson, '@react-native-masked-view/masked-view', 'dependencies')}" implementation "org.wordpress-mobile:react-native-screens:${extractPackageVersion(packageJson, 'react-native-screens', 'dependencies')}" implementation "org.wordpress-mobile:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-reanimated:${extractPackageVersion(packageJson, 'react-native-reanimated', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-prompt-android:${extractPackageVersion(packageJson, 'react-native-prompt-android', 'dependencies')}" + implementation "com.github.wordpress-mobile:react-native-reanimated:update~android-12-1.9.0-g0ae9a17" + implementation "com.github.wordpress-mobile:react-native-prompt-android:update~android-12-SNAPSHOT" 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 "org.wordpress-mobile:react-native-fast-image:${extractPackageVersion(packageJson, 'react-native-fast-image', '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:update~android-12-SNAPSHOT", { // Remove Reanimated transitive dependency as it's already defined here exclude group: 'com.github.wordpress-mobile', module: 'react-native-reanimated' }) From aca09848d1f531520a3d6625a8b3f64f103a698d Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 4 Oct 2022 18:40:56 +0200 Subject: [PATCH 04/11] [TEST] Point react-native-aztec Android dependencies to SHA commits --- packages/react-native-aztec/android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native-aztec/android/build.gradle b/packages/react-native-aztec/android/build.gradle index 3f81151b878dbf..d1a81c26705d36 100644 --- a/packages/react-native-aztec/android/build.gradle +++ b/packages/react-native-aztec/android/build.gradle @@ -7,9 +7,9 @@ buildscript { robolectricVersion = '3.5.1' jUnitVersion = '4.12' jSoupVersion = '1.10.3' - wordpressUtilsVersion = '2.3.0' + wordpressUtilsVersion = '110-13b4f06680ed8c145cbd09d63c4998dfe8b3b9de' espressoVersion = '3.0.1' - aztecVersion = 'v1.6.0' + aztecVersion = '1006-3fdbbc2086fb71d3750b01c013fa5cf6024c3142' } } From 21df09d616a5529cfb43940b7408338b0c2c8f41 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 5 Oct 2022 11:31:41 +0200 Subject: [PATCH 05/11] Bump Android build tools version to 31 --- packages/react-native-editor/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native-editor/android/build.gradle b/packages/react-native-editor/android/build.gradle index 9e806673d38593..480a6ff66e2492 100644 --- a/packages/react-native-editor/android/build.gradle +++ b/packages/react-native-editor/android/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { gradlePluginVersion = '7.2.1' kotlinVersion = '1.5.32' - buildToolsVersion = "30.0.2" + buildToolsVersion = "31.0.0" minSdkVersion = 21 compileSdkVersion = 31 targetSdkVersion = 31 From fdc7cc888f5d38a9260d94d768c657766fc8efff Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 7 Oct 2022 13:34:03 +0200 Subject: [PATCH 06/11] Fix extra space on Aztec views --- .../android/src/main/res/values/template-dimens.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-native-aztec/android/src/main/res/values/template-dimens.xml b/packages/react-native-aztec/android/src/main/res/values/template-dimens.xml index b6d7bbbf6f5de7..6e6f65ddcb17e1 100644 --- a/packages/react-native-aztec/android/src/main/res/values/template-dimens.xml +++ b/packages/react-native-aztec/android/src/main/res/values/template-dimens.xml @@ -23,4 +23,5 @@ 32dp 0dp + 0dp From 9e836f9c290ac639bfd9fec3f842a401bb6d0839 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 7 Oct 2022 13:43:56 +0200 Subject: [PATCH 07/11] Update react-native-editor changelog --- packages/react-native-editor/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md index 72409d9ac9e0fd..6b027e1fbe7da9 100644 --- a/packages/react-native-editor/CHANGELOG.md +++ b/packages/react-native-editor/CHANGELOG.md @@ -10,6 +10,7 @@ For each user feature we should also add a importance categorization label to i --> ## Unreleased +- [*] Upgrade compile and target sdk version to Android API 31 [#44610] ## 1.82.1 - [**] List block v2: Fix issues splitting or merging paragraphs into the block [#43949] From 6ce605b90b0f08026e8748fab2f7006daaee675b Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 13 Oct 2022 12:32:17 +0200 Subject: [PATCH 08/11] Update Aztec version to 1.6.2 --- packages/react-native-aztec/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native-aztec/android/build.gradle b/packages/react-native-aztec/android/build.gradle index d1a81c26705d36..5cad8df47cbc3e 100644 --- a/packages/react-native-aztec/android/build.gradle +++ b/packages/react-native-aztec/android/build.gradle @@ -9,7 +9,7 @@ buildscript { jSoupVersion = '1.10.3' wordpressUtilsVersion = '110-13b4f06680ed8c145cbd09d63c4998dfe8b3b9de' espressoVersion = '3.0.1' - aztecVersion = '1006-3fdbbc2086fb71d3750b01c013fa5cf6024c3142' + aztecVersion = 'v1.6.2' } } From 3b3faa500a57d977f6334aa220ccd61f54d482e8 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 13 Oct 2022 13:48:29 +0200 Subject: [PATCH 09/11] Revert: Point Android dependencies to snapshot version --- .../android/react-native-bridge/build.gradle | 12 ++++++------ .../react-native-editor/android/app/build.gradle | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) 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 5fdceb593c2011..70f3d4c4307c98 100644 --- a/packages/react-native-bridge/android/react-native-bridge/build.gradle +++ b/packages/react-native-bridge/android/react-native-bridge/build.gradle @@ -65,20 +65,20 @@ dependencies { implementation "com.facebook.react:react-native:$rnVersion" implementation "org.wordpress-mobile:react-native-svg:${extractPackageVersion(packageJson, 'react-native-svg', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-video:update~android-12-SNAPSHOT" - implementation "com.github.wordpress-mobile:react-native-linear-gradient:update~android-12-SNAPSHOT" - implementation "com.github.wordpress-mobile:react-native-slider:update~android-12-SNAPSHOT" + implementation "com.github.wordpress-mobile:react-native-video:${extractPackageVersion(packageJson, 'react-native-video', 'dependencies')}" + implementation "com.github.wordpress-mobile:react-native-linear-gradient:${extractPackageVersion(packageJson, 'react-native-linear-gradient', 'dependencies')}" + implementation "com.github.wordpress-mobile:react-native-slider:${extractPackageVersion(packageJson, '@react-native-community/slider', 'dependencies')}" implementation "org.wordpress-mobile:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}" implementation "org.wordpress-mobile:react-native-masked-view:${extractPackageVersion(packageJson, '@react-native-masked-view/masked-view', 'dependencies')}" implementation "org.wordpress-mobile:react-native-screens:${extractPackageVersion(packageJson, 'react-native-screens', 'dependencies')}" implementation "org.wordpress-mobile:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-reanimated:update~android-12-1.9.0-g0ae9a17" - implementation "com.github.wordpress-mobile:react-native-prompt-android:update~android-12-SNAPSHOT" + implementation "com.github.wordpress-mobile:react-native-reanimated:${extractPackageVersion(packageJson, 'react-native-reanimated', 'dependencies')}" + implementation "com.github.wordpress-mobile:react-native-prompt-android:${extractPackageVersion(packageJson, 'react-native-prompt-android', '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 "org.wordpress-mobile:react-native-fast-image:${extractPackageVersion(packageJson, 'react-native-fast-image', 'dependencies')}" - implementation("com.github.wordpress-mobile:react-native-gesture-handler:update~android-12-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 8f42f5652fd8a1..e4b5d092724e26 100644 --- a/packages/react-native-editor/android/app/build.gradle +++ b/packages/react-native-editor/android/app/build.gradle @@ -182,20 +182,20 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" implementation "org.wordpress-mobile:react-native-svg:${extractPackageVersion(packageJson, 'react-native-svg', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-video:update~android-12-SNAPSHOT" - implementation "com.github.wordpress-mobile:react-native-linear-gradient:update~android-12-SNAPSHOT" - implementation "com.github.wordpress-mobile:react-native-slider:update~android-12-SNAPSHOT" + implementation "com.github.wordpress-mobile:react-native-video:${extractPackageVersion(packageJson, 'react-native-video', 'dependencies')}" + implementation "com.github.wordpress-mobile:react-native-linear-gradient:${extractPackageVersion(packageJson, 'react-native-linear-gradient', 'dependencies')}" + implementation "com.github.wordpress-mobile:react-native-slider:${extractPackageVersion(packageJson, '@react-native-community/slider', 'dependencies')}" implementation "org.wordpress-mobile:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}" implementation "org.wordpress-mobile:react-native-masked-view:${extractPackageVersion(packageJson, '@react-native-masked-view/masked-view', 'dependencies')}" implementation "org.wordpress-mobile:react-native-screens:${extractPackageVersion(packageJson, 'react-native-screens', 'dependencies')}" implementation "org.wordpress-mobile:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}" - implementation "com.github.wordpress-mobile:react-native-reanimated:update~android-12-1.9.0-g0ae9a17" - implementation "com.github.wordpress-mobile:react-native-prompt-android:update~android-12-SNAPSHOT" + implementation "com.github.wordpress-mobile:react-native-reanimated:${extractPackageVersion(packageJson, 'react-native-reanimated', 'dependencies')}" + implementation "com.github.wordpress-mobile:react-native-prompt-android:${extractPackageVersion(packageJson, 'react-native-prompt-android', '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 "org.wordpress-mobile:react-native-fast-image:${extractPackageVersion(packageJson, 'react-native-fast-image', 'dependencies')}" - implementation("com.github.wordpress-mobile:react-native-gesture-handler:update~android-12-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' }) From 4a8664d3517db54096e7540bd5b279187e66bf10 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 13 Oct 2022 14:19:23 +0200 Subject: [PATCH 10/11] Bump react-native-editor dependencies from forked repos --- package-lock.json | 64 +++++++++---------- packages/react-native-editor/ios/Podfile.lock | 24 +++---- packages/react-native-editor/package.json | 14 ++-- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/package-lock.json b/package-lock.json index 73a309a4b79959..1c3f7f100613fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9079,8 +9079,8 @@ } }, "@react-native-community/slider": { - "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-2/react-native-community-slider-3.0.2-wp-2.tgz", - "integrity": "sha512-JKRintAuY/fyf30euhB7Exu4r8Lp3n4Mw55J920zfAKuBfFJbmLvLEahvwxUdO9nkBMMJl4r3xquW+qqiXbHIQ==" + "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-3/react-native-community-slider-3.0.2-wp-3.tgz", + "integrity": "sha512-Ye+9z1udSI0uLOrc0+sSueaFJZSWmv6yEq3Ujxm+ShvBje8JxQrKPbH3UYCdEjNCnrY1Zi6lT/8e98dQn/7BNA==" }, "@react-native-masked-view/masked-view": { "version": "0.2.6", @@ -18344,7 +18344,7 @@ "@babel/runtime": "^7.16.0", "@react-native-clipboard/clipboard": "1.9.0", "@react-native-community/blur": "3.6.0", - "@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-2/react-native-community-slider-3.0.2-wp-2.tgz", + "@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-3/react-native-community-slider-3.0.2-wp-3.tgz", "@react-native-masked-view/masked-view": "0.2.6", "@react-navigation/core": "5.12.0", "@react-navigation/native": "5.7.0", @@ -18370,22 +18370,22 @@ "node-fetch": "^2.6.0", "react-native": "0.66.2", "react-native-fast-image": "8.5.11", - "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-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.3.2-wp-2/react-native-gesture-handler-2.3.2-wp-2.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", + "react-native-hsv-color-picker": "https://raw.githubusercontent.com/wordpress-mobile/react-native-hsv-color-picker/v1.0.1-wp-3/react-native-hsv-color-picker-1.0.1-wp-3.tgz", "react-native-keyboard-aware-scroll-view": "https://raw.githubusercontent.com/wordpress-mobile/react-native-keyboard-aware-scroll-view/v0.8.8-wp-1/react-native-keyboard-aware-scroll-view-0.8.8-wp-1.tgz", - "react-native-linear-gradient": "https://raw.githubusercontent.com/wordpress-mobile/react-native-linear-gradient/v2.5.6-wp-2/react-native-linear-gradient-2.5.6-wp-2.tgz", + "react-native-linear-gradient": "https://raw.githubusercontent.com/wordpress-mobile/react-native-linear-gradient/v2.5.6-wp-3/react-native-linear-gradient-2.5.6-wp-3.tgz", "react-native-modal": "^11.10.0", - "react-native-prompt-android": "https://raw.githubusercontent.com/wordpress-mobile/react-native-prompt-android/v1.0.0-wp-2/react-native-prompt-android-1.0.0-wp-2.tgz", - "react-native-reanimated": "https://raw.githubusercontent.com/wordpress-mobile/react-native-reanimated/2.4.1-wp-3/react-native-reanimated-2.4.1-wp-3.tgz", + "react-native-prompt-android": "https://raw.githubusercontent.com/wordpress-mobile/react-native-prompt-android/v1.0.0-wp-3/react-native-prompt-android-1.0.0-wp-3.tgz", + "react-native-reanimated": "https://raw.githubusercontent.com/wordpress-mobile/react-native-reanimated/2.4.1-wp-4/react-native-reanimated-2.4.1-wp-4.tgz", "react-native-safe-area": "^0.5.0", "react-native-safe-area-context": "3.2.0", "react-native-sass-transformer": "^1.1.1", "react-native-screens": "2.9.0", "react-native-svg": "9.13.6", "react-native-url-polyfill": "^1.1.2", - "react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-2/react-native-video-5.2.0-wp-2.tgz", + "react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-4/react-native-video-5.2.0-wp-4.tgz", "react-native-webview": "11.6.2" } }, @@ -43430,7 +43430,7 @@ "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" + "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" }, "lodash.ismatch": { "version": "4.4.0", @@ -51182,9 +51182,9 @@ "dev": true }, "react-freeze": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.0.tgz", - "integrity": "sha512-yQaiOqDmoKqks56LN9MTgY06O0qQHgV4FUrikH357DydArSZHQhl0BJFqGKIZoTqi8JizF9Dxhuk1FIZD6qCaw==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.3.tgz", + "integrity": "sha512-ZnXwLQnGzrDpHBHiC56TXFXvmolPeMjTn1UOm610M4EXGzbEDR7oOIyS2ZiItgbs6eZc4oU/a0hpk8PrcKvv5g==" }, "react-input-autosize": { "version": "3.0.0", @@ -51302,8 +51302,8 @@ "integrity": "sha512-cNW4bIJg3nvKaheG8vGMfqCt5LMWX9MS5+wMudgKIHbGO51spRr4sgnlhVgwHLcZ5aeNOVJ8CPRxDIWKRq/0QA==" }, "react-native-gesture-handler": { - "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==", + "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.3.2-wp-2/react-native-gesture-handler-2.3.2-wp-2.tgz", + "integrity": "sha512-+3mILQmvf4cyqyOBTjeFqv2XnoYJgyXudSF3zfzPrlaGvRnWUO8N4LXnsmRvJktMtA6jhtoQx7TgbYQIe+hlBQ==", "requires": { "@egjs/hammerjs": "^2.0.17", "hoist-non-react-statics": "^3.3.0", @@ -51325,10 +51325,10 @@ "from": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3" }, "react-native-hsv-color-picker": { - "version": "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", - "integrity": "sha512-IBbGVHgHCTOX/qCo92aVHuWciDA0gFLsSK5ErosviTlI/qVXI/JeBFBCu2hdaNhKKwf3IqkgPwwdSZDlPiQBqQ==", + "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-hsv-color-picker/v1.0.1-wp-3/react-native-hsv-color-picker-1.0.1-wp-3.tgz", + "integrity": "sha512-p8wQ5R9CG6uVJMu8BkRRUsIhPgJnc05TjLA+y5R/RxNE+OvT4VczIjPAeQ78w41YBba9zawGTiPIDOaGwZN0nw==", "requires": { - "react-native-linear-gradient": "https://raw.githubusercontent.com/wordpress-mobile/react-native-linear-gradient/v2.5.6-wp-2/react-native-linear-gradient-2.5.6-wp-2.tgz", + "react-native-linear-gradient": "https://raw.githubusercontent.com/wordpress-mobile/react-native-linear-gradient/v2.5.6-wp-3/react-native-linear-gradient-2.5.6-wp-3.tgz", "tinycolor2": "^1.4.1" } }, @@ -51346,8 +51346,8 @@ } }, "react-native-linear-gradient": { - "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-linear-gradient/v2.5.6-wp-2/react-native-linear-gradient-2.5.6-wp-2.tgz", - "integrity": "sha512-XD9rsrONXD4TS76hbb5U3na9/8MUcP69sTgFvyrexgOu3ZbRyBlePZRXGWt9KB+7PK9659+jl+3Bu8d8cQ3iVA==" + "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-linear-gradient/v2.5.6-wp-3/react-native-linear-gradient-2.5.6-wp-3.tgz", + "integrity": "sha512-Xq/ABki6/zz6ejut2wPWrh2ZV9Cw5NhHsFcB1adhY/Z2YIVyAVnpApwhMWVV6BxbtKcl17eMPR6vpOI5Q76BjA==" }, "react-native-modal": { "version": "11.10.0", @@ -51359,12 +51359,12 @@ } }, "react-native-prompt-android": { - "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-prompt-android/v1.0.0-wp-2/react-native-prompt-android-1.0.0-wp-2.tgz", - "integrity": "sha512-9whL4Kc5OU5Q89Dneq8oT8vpQTA/cEz24EIPXEQ2KGo1Dkf4qzer5+98YXJM2F8yitCP8UKHOL8WIiE7zukXBA==" + "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-prompt-android/v1.0.0-wp-3/react-native-prompt-android-1.0.0-wp-3.tgz", + "integrity": "sha512-JyNcFTqyQh1YVOTMamH29/wzspXH1+AlDbxiuW07gkhdw0BspCdq2P0Vf6JzPdiDxhv/v1+ix4t6RjAKGWulGQ==" }, "react-native-reanimated": { - "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-reanimated/2.4.1-wp-3/react-native-reanimated-2.4.1-wp-3.tgz", - "integrity": "sha512-LnfbSRe9WZIj/LT9ZrtiDKCjEqCPp+wcugBIUCgfb6przB3dwrCOiFdxZBD+Py58h6wN7fVpIOhPaP5rGQ1TQQ==", + "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-reanimated/2.4.1-wp-4/react-native-reanimated-2.4.1-wp-4.tgz", + "integrity": "sha512-kPA7eM0Rn96ZzKId4QPaBnJ8UwC7NwT/CrruszF7fY+Xb1DGAY3vP7ZJu1ZsNbsxdK2ERNWZ9bnocXop4QV7cg==", "requires": { "@babel/plugin-transform-object-assign": "^7.10.4", "@types/invariant": "^2.2.35", @@ -51376,9 +51376,9 @@ }, "dependencies": { "react-native-screens": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.13.1.tgz", - "integrity": "sha512-xcrnuUs0qUrGpc2gOTDY4VgHHADQwp80mwR1prU/Q0JqbZN5W3koLhuOsT6FkSRKjR5t40l+4LcjhHdpqRB2HA==", + "version": "3.18.1", + "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.18.1.tgz", + "integrity": "sha512-GtEC1AbvpvtKDJldavuONF/hXW1aEZO7qz8SioyHrV9L9/nDiy+iTviMFmeEoix9KwmEHHxoYxc0xiDrFxKHyA==", "requires": { "react-freeze": "^1.0.0", "warn-once": "^0.1.0" @@ -51498,8 +51498,8 @@ } }, "react-native-video": { - "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-2/react-native-video-5.2.0-wp-2.tgz", - "integrity": "sha512-HLDADDlR5tlEaWVtbiJBk3Fa0UzQuNXiwk9vpWXP+Au7QL6FDJeRjubgwBZuVt5FhCjgPAzdDO6ixJcPatWS2g==", + "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-4/react-native-video-5.2.0-wp-4.tgz", + "integrity": "sha512-Y/kCq6hGDOMkT4VLuGtSgJaCF5QWUIipYvqTpgLaPXF33tT9evqTtKXt6OjSFyuaoxXv9rrxaNoN70Fai2A91Q==", "requires": { "prop-types": "^15.7.2" } @@ -58621,9 +58621,9 @@ } }, "warn-once": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/warn-once/-/warn-once-0.1.0.tgz", - "integrity": "sha512-recZTSvuaH/On5ZU5ywq66y99lImWqzP93+AiUo9LUwG8gXHW+LJjhOd6REJHm7qb0niYqrEQJvbHSQfuJtTqA==" + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/warn-once/-/warn-once-0.1.1.tgz", + "integrity": "sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q==" }, "warning": { "version": "4.0.3", diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock index 555e7b6dcb7ba6..7649f83b1a3671 100644 --- a/packages/react-native-editor/ios/Podfile.lock +++ b/packages/react-native-editor/ios/Podfile.lock @@ -1,6 +1,6 @@ PODS: - boost (1.76.0) - - BVLinearGradient (2.5.6-wp-2): + - BVLinearGradient (2.5.6-wp-3): - React-Core - DoubleConversion (1.1.6) - FBLazyVector (0.66.2) @@ -235,12 +235,12 @@ PODS: - React-Core - react-native-safe-area-context (3.2.0): - React-Core - - react-native-slider (3.0.2-wp-2): + - react-native-slider (3.0.2-wp-3): - React-Core - - react-native-video (5.2.0-wp-2): + - react-native-video (5.2.0-wp-4): - React-Core - - react-native-video/Video (= 5.2.0-wp-2) - - react-native-video/Video (5.2.0-wp-2): + - react-native-video/Video (= 5.2.0-wp-4) + - react-native-video/Video (5.2.0-wp-4): - React-Core - react-native-webview (11.6.2): - React-Core @@ -317,9 +317,9 @@ PODS: - React-Core - SDWebImage (~> 5.11.1) - SDWebImageWebPCoder (~> 0.8.4) - - RNGestureHandler (2.3.2-wp-1): + - RNGestureHandler (2.3.2-wp-2): - React-Core - - RNReanimated (2.4.1-wp-3): + - RNReanimated (2.4.1-wp-4): - DoubleConversion - FBLazyVector - FBReactNativeSpec @@ -522,7 +522,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 - BVLinearGradient: f6eff3552b842aac99ff6f21197e57f87cfd956d + BVLinearGradient: ace34fab72158c068ae989a0ebdbf86cb4ef0e49 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 FBLazyVector: 57a8b34460679fb69e1ce7d625b04dbd1596b1f1 FBReactNativeSpec: 18438b1c04ce502ed681cd19db3f4508964c082a @@ -547,8 +547,8 @@ SPEC CHECKSUMS: react-native-keyboard-aware-scroll-view: 0bc6c2dfe9056935a40dc1a70e764b7a1bbf6568 react-native-safe-area: c9cf765aa2dd96159476a99633e7d462ce5bb94f react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79 - react-native-slider: d4c3367c5db5d2bec3ac0ab9d15ebb73d896034c - react-native-video: 0b09cc469df0249509def5dc1484e0419342de9b + react-native-slider: a433f1c13c5da3c17a587351bff7371f65cc9a07 + react-native-video: 628148a219f300d4d9f8127563aea2fe0120b718 react-native-webview: 193d233c29eacce1f42ca2637dab7ba79c25a6de React-perflogger: 5ab487cacfe6ec19bfe3d3f8072bf71eb07d63da React-RCTActionSheet: 03f25695e095fb5aa003828620943c74cc281fec @@ -565,8 +565,8 @@ SPEC CHECKSUMS: RNCClipboard: 99fc8ad669a376b756fbc8098ae2fd05c0ed0668 RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7 - RNGestureHandler: 3b13cc25407d1cdbee33b6ae65790a55c032d2a9 - RNReanimated: b413cc7aa3e2a740d9804cda3a9396a68f9eea7f + RNGestureHandler: 3e0ea0c115175e66680032904339696bab928ca3 + RNReanimated: 2366094144f5bfc2179b401237ef49034ecbee3e RNScreens: 953633729a42e23ad0c93574d676b361e3335e8b RNSVG: 36a7359c428dcb7c6bce1cc546fbfebe069809b0 RNTAztecView: 8cb0bd37845a25eab416611e92d5adaf5a4931ac diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index bbed3427be5088..eda96bf8985c23 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -32,7 +32,7 @@ "@babel/runtime": "^7.16.0", "@react-native-clipboard/clipboard": "1.9.0", "@react-native-community/blur": "3.6.0", - "@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-2/react-native-community-slider-3.0.2-wp-2.tgz", + "@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-3/react-native-community-slider-3.0.2-wp-3.tgz", "@react-native-masked-view/masked-view": "0.2.6", "@react-navigation/core": "5.12.0", "@react-navigation/native": "5.7.0", @@ -58,22 +58,22 @@ "node-fetch": "^2.6.0", "react-native": "0.66.2", "react-native-fast-image": "8.5.11", - "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-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.3.2-wp-2/react-native-gesture-handler-2.3.2-wp-2.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", + "react-native-hsv-color-picker": "https://raw.githubusercontent.com/wordpress-mobile/react-native-hsv-color-picker/v1.0.1-wp-3/react-native-hsv-color-picker-1.0.1-wp-3.tgz", "react-native-keyboard-aware-scroll-view": "https://raw.githubusercontent.com/wordpress-mobile/react-native-keyboard-aware-scroll-view/v0.8.8-wp-1/react-native-keyboard-aware-scroll-view-0.8.8-wp-1.tgz", - "react-native-linear-gradient": "https://raw.githubusercontent.com/wordpress-mobile/react-native-linear-gradient/v2.5.6-wp-2/react-native-linear-gradient-2.5.6-wp-2.tgz", + "react-native-linear-gradient": "https://raw.githubusercontent.com/wordpress-mobile/react-native-linear-gradient/v2.5.6-wp-3/react-native-linear-gradient-2.5.6-wp-3.tgz", "react-native-modal": "^11.10.0", - "react-native-prompt-android": "https://raw.githubusercontent.com/wordpress-mobile/react-native-prompt-android/v1.0.0-wp-2/react-native-prompt-android-1.0.0-wp-2.tgz", - "react-native-reanimated": "https://raw.githubusercontent.com/wordpress-mobile/react-native-reanimated/2.4.1-wp-3/react-native-reanimated-2.4.1-wp-3.tgz", + "react-native-prompt-android": "https://raw.githubusercontent.com/wordpress-mobile/react-native-prompt-android/v1.0.0-wp-3/react-native-prompt-android-1.0.0-wp-3.tgz", + "react-native-reanimated": "https://raw.githubusercontent.com/wordpress-mobile/react-native-reanimated/2.4.1-wp-4/react-native-reanimated-2.4.1-wp-4.tgz", "react-native-safe-area": "^0.5.0", "react-native-safe-area-context": "3.2.0", "react-native-sass-transformer": "^1.1.1", "react-native-screens": "2.9.0", "react-native-svg": "9.13.6", "react-native-url-polyfill": "^1.1.2", - "react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-2/react-native-video-5.2.0-wp-2.tgz", + "react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-4/react-native-video-5.2.0-wp-4.tgz", "react-native-webview": "11.6.2" }, "publishConfig": { From 0e1808407a63a38b2b18ef96255f7c0f29f103c8 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 13 Oct 2022 14:40:00 +0200 Subject: [PATCH 11/11] Revert updating wordpressUtilsVersion --- packages/react-native-aztec/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native-aztec/android/build.gradle b/packages/react-native-aztec/android/build.gradle index 5cad8df47cbc3e..c99fd0e4ca417f 100644 --- a/packages/react-native-aztec/android/build.gradle +++ b/packages/react-native-aztec/android/build.gradle @@ -7,7 +7,7 @@ buildscript { robolectricVersion = '3.5.1' jUnitVersion = '4.12' jSoupVersion = '1.10.3' - wordpressUtilsVersion = '110-13b4f06680ed8c145cbd09d63c4998dfe8b3b9de' + wordpressUtilsVersion = '2.3.0' espressoVersion = '3.0.1' aztecVersion = 'v1.6.2' }