From e9a0213b1be6c3b8384342c166d4c2feea1481fb Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 7 Jun 2023 16:31:28 +0200 Subject: [PATCH 01/18] Update React Native version and use new modules --- build.gradle | 5 +---- libs/editor/build.gradle | 15 ++------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index c3700e63889e..1f6e666a065a 100644 --- a/build.gradle +++ b/build.gradle @@ -80,10 +80,7 @@ ext { zendeskVersion = '5.1.2' // react native - facebookReactVersion = '0.69.4:release@aar' - facebookSoloaderVersion = '0.10.4' - facebookFrescoVersion = '2.5.0' - facebookFbjniVersion = '0.2.2' + facebookReactVersion = '0.71.8' // test assertjVersion = '3.23.1' diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 367261363bb8..51c9000a31c9 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -68,19 +68,8 @@ dependencies { } } - // Forcing version due to https://github.com/facebook/SoLoader/issues/94 - // To be removed with React Native 0.70+ - implementation("com.facebook.soloader:soloader:$facebookSoloaderVersion") { - version { - strictly facebookSoloaderVersion - } - } - - implementation "com.facebook.fresco:fresco:$facebookFrescoVersion" - implementation "com.facebook.fresco:imagepipeline-okhttp3:$facebookFrescoVersion" - implementation "com.facebook.fbjni:fbjni:$facebookFbjniVersion" - implementation "com.facebook.react:hermes-engine:$facebookReactVersion" - implementation "com.facebook.react:react-native:$facebookReactVersion" + implementation "com.facebook.react:hermes-android:$facebookReactVersion" + implementation "com.facebook.react:react-android:$facebookReactVersion" // This dependency will be substituted if the `local-builds.gradle` file contains // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file. From be0b54c4a7cb94f3858311b834a7fef379628766 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 7 Jun 2023 16:31:41 +0200 Subject: [PATCH 02/18] Bump Android Gradle plugin version --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index ae304cea2a63..1f4131886b30 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ pluginManagement { gradle.ext.kotlinVersion = '1.8.21' - gradle.ext.agpVersion = '7.2.1' + gradle.ext.agpVersion = '7.3.1' gradle.ext.daggerVersion = "2.46.1" gradle.ext.detektVersion = '1.21.0' gradle.ext.navComponentVersion = '2.4.2' From 50feeda05b4d542af9dea351e6a388d592f53873 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 16 Jun 2023 18:20:10 +0200 Subject: [PATCH 03/18] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1f6e666a065a..97f1fef6b5b2 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.1.0' automatticTracksVersion = '3.0.0' - gutenbergMobileVersion = 'v1.97.0-alpha1' + gutenbergMobileVersion = '5872-09f2e5a7fd7f266ce6f9298f4a7392a326b8782a' wordPressAztecVersion = 'v1.6.4' wordPressFluxCVersion = '2.30.0' wordPressLoginVersion = '1.3.0' From 238a47dc2a7e89eb615ba2d68105104f21cd90b8 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 16 Jun 2023 19:26:15 +0200 Subject: [PATCH 04/18] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 47a88def09ab..b448f16dba62 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.1.0' automatticTracksVersion = '3.0.0' - gutenbergMobileVersion = '5872-09f2e5a7fd7f266ce6f9298f4a7392a326b8782a' + gutenbergMobileVersion = '5872-f726421e2f080540b86d3569a65c320c03071308' wordPressAztecVersion = 'v1.6.4' wordPressFluxCVersion = '2.30.0' wordPressLoginVersion = '1.3.0' From 88f817bd1e4f6ab2d5624c74e8676834d7bf42bf Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Mon, 19 Jun 2023 16:24:11 -0400 Subject: [PATCH 05/18] build: Update React Native to 0.71.11 Includes a necessary fix for WordPress-Android integration. https://github.com/facebook/react-native/pull/36121 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b448f16dba62..a67d844a367c 100644 --- a/build.gradle +++ b/build.gradle @@ -80,7 +80,7 @@ ext { zendeskVersion = '5.1.2' // react native - facebookReactVersion = '0.71.8' + facebookReactVersion = '0.71.11' // test assertjVersion = '3.23.1' From dc11629ec0fe90ca919b9c5a4d8da3e7079bb34d Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Wed, 21 Jun 2023 16:57:29 -0400 Subject: [PATCH 06/18] Revert "Bump Android Gradle plugin version" This reverts commit be0b54c4a7cb94f3858311b834a7fef379628766. --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 0170f5867fb4..b0677203b64b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ pluginManagement { gradle.ext.kotlinVersion = '1.8.21' - gradle.ext.agpVersion = '7.3.1' + gradle.ext.agpVersion = '7.2.1' gradle.ext.googleServicesVersion = '4.3.15' gradle.ext.navigationVersion = '2.5.3' gradle.ext.sentryVersion = '3.5.0' From c6a1e8b5edeaece1de1bbe3c71c30db1aabf33f1 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Wed, 21 Jun 2023 17:44:36 -0400 Subject: [PATCH 07/18] build: Update Gutenberg ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a67d844a367c..fce564d8cece 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.1.0' automatticTracksVersion = '3.0.0' - gutenbergMobileVersion = '5872-f726421e2f080540b86d3569a65c320c03071308' + gutenbergMobileVersion = '5872-0e3e66a78914aa8f49d78231b29af74cb99b906e' wordPressAztecVersion = 'v1.6.4' wordPressFluxCVersion = '2.30.0' wordPressLoginVersion = '1.3.0' From db463fadb56ea97562d334b45c483d5f0edfc0cb Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 30 Jun 2023 13:39:33 +0200 Subject: [PATCH 08/18] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7a5a87b00acc..c71bc92562e2 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.1.0' automatticTracksVersion = '3.0.0' - gutenbergMobileVersion = '5872-0e3e66a78914aa8f49d78231b29af74cb99b906e' + gutenbergMobileVersion = '5872-653ab749b6ebd28cadbb6f6af626de1abab680c0' wordPressAztecVersion = 'v1.6.4' wordPressFluxCVersion = '2.30.0' wordPressLoginVersion = '1.3.0' From 6bf29467644e0190cabe56633153f7d7ce5f93f2 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 4 Jul 2023 09:58:11 +0200 Subject: [PATCH 09/18] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c6a4d38d9b4d..eaeaa0e62aee 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.1.0' automatticTracksVersion = '3.0.0' - gutenbergMobileVersion = '5872-653ab749b6ebd28cadbb6f6af626de1abab680c0' + gutenbergMobileVersion = '5874-0713af57aa8220e35f8cab5a41aab5236aa580de' wordPressAztecVersion = 'v1.6.4' wordPressFluxCVersion = '2.34.0' wordPressLoginVersion = '1.3.0' From f1ce5ca0f3c27811768884ac0155cd027975fa57 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Tue, 4 Jul 2023 15:43:01 -0400 Subject: [PATCH 10/18] build: Update Gutenberg ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index eaeaa0e62aee..f2f6229e71a2 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.1.0' automatticTracksVersion = '3.0.0' - gutenbergMobileVersion = '5874-0713af57aa8220e35f8cab5a41aab5236aa580de' + gutenbergMobileVersion = '5874-628f596ad1c588df1be34d53431ee08f1fc3675d' wordPressAztecVersion = 'v1.6.4' wordPressFluxCVersion = '2.34.0' wordPressLoginVersion = '1.3.0' From a9d41afbf0b2a7be18d5549c93eedd9236054814 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 20 Jul 2023 19:02:34 +0200 Subject: [PATCH 11/18] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0fdc6ff93ead..01a6a497fe3c 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.1.0' automatticTracksVersion = '3.0.0' - gutenbergMobileVersion = '5874-826a61621b1d69b2e5e610280de8459f09d6c0a8' + gutenbergMobileVersion = '5874-f54468c6dc1be7055dbe10594a43568bbd13a813' wordPressAztecVersion = 'v1.6.4' wordPressFluxCVersion = '2.37.0' wordPressLoginVersion = '1.3.0' From e23a59a4f71817e5cdc0cdc0833c713fb99137bd Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 20 Jul 2023 19:02:43 +0200 Subject: [PATCH 12/18] Update release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index fd37b2fe4007..182a3658e2ae 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -3,6 +3,7 @@ 22.9 ----- * [**] Block editor: Move undo/redo buttons to the navigation bar [https://github.com/wordpress-mobile/WordPress-Android/pull/18705] +* [**] [internal] Upgrade React Native to 0.71.11 [https://github.com/wordpress-mobile/WordPress-Android/pull/18613] 22.8 ----- From d1d634b535cf24d5ee151c5eb7453e5c14ea9c03 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 21 Jul 2023 15:46:51 +0200 Subject: [PATCH 13/18] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 01a6a497fe3c..842fd90e399e 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.1.0' automatticTracksVersion = '3.0.0' - gutenbergMobileVersion = '5874-f54468c6dc1be7055dbe10594a43568bbd13a813' + gutenbergMobileVersion = '5874-77f2c68803c6b069c91932206b38e6f07da58570' wordPressAztecVersion = 'v1.6.4' wordPressFluxCVersion = '2.37.0' wordPressLoginVersion = '1.3.0' From 93d2baab8b07f2f8e6bfe4119e84f5b6497cbe3d Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 21 Jul 2023 16:38:58 +0200 Subject: [PATCH 14/18] Add new React Native modules to Dependabot's ignore list --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0ef1136e6d99..527d38264eec 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -22,7 +22,9 @@ updates: # React Native upgrade. For more details, see # https://github.com/wordpress-mobile/WordPress-Android/pull/18494#issuecomment-1566922244 - dependency-name: "com.facebook.react:react-native" + - dependency-name: "com.facebook.react:react-android" - dependency-name: "com.facebook.react:hermes-engine" + - dependency-name: "com.facebook.react:hermes-android" - dependency-name: "com.facebook.fresco:fresco" - dependency-name: "com.facebook.fresco:imagepipeline-okhttp3" - dependency-name: "com.facebook.fbjni:fbjni" From b751ec2e1e0809d6df29de3b99a5524eaf9c94da Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 21 Jul 2023 16:42:34 +0200 Subject: [PATCH 15/18] Exclude new React Native modules when using local GB-mobile path --- libs/editor/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 51c9000a31c9..4c0b9a32fe3f 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -74,8 +74,12 @@ dependencies { // This dependency will be substituted if the `local-builds.gradle` file contains // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file. implementation ("$rootProject.gradle.ext.gutenbergMobileBinaryPath:$rootProject.ext.gutenbergMobileVersion") { + // We exclude React Native modules from older and newer versions. + // This is needed to avoid Duplicate class errors when building using local Gutenberg Mobile path. exclude module: 'hermes-engine' exclude module: 'react-native' + exclude module: 'hermes-android' + exclude module: 'react-android' } implementation "org.wordpress:utils:$wordPressUtilsVersion" From 3a63150698e24a7820b26b108fea4871f76f0204 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Wed, 26 Jul 2023 20:55:21 -0400 Subject: [PATCH 16/18] build: Update Gutenberg ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a28210a21260..fa3602a26a0c 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.1.0' automatticTracksVersion = '3.0.0' - gutenbergMobileVersion = '5874-77f2c68803c6b069c91932206b38e6f07da58570' + gutenbergMobileVersion = '5874-be8917c55fb6bdc33dcd8e283b9f7e59f4fc1bad' wordPressAztecVersion = 'v1.6.4' wordPressFluxCVersion = '2.37.0' wordPressLoginVersion = '1.3.0' From ec16a99d13da01df063f548a1ad955c322432833 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 27 Jul 2023 16:22:51 +0200 Subject: [PATCH 17/18] Update release notes --- RELEASE-NOTES.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index ad79afc149b9..c64f3d5de320 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -2,12 +2,11 @@ 23.0 ----- - +* [**] [internal] Upgrade React Native to 0.71.11 [https://github.com/wordpress-mobile/WordPress-Android/pull/18613] 22.9 ----- * [**] Block editor: Move undo/redo buttons to the navigation bar [https://github.com/wordpress-mobile/WordPress-Android/pull/18705] -* [**] [internal] Upgrade React Native to 0.71.11 [https://github.com/wordpress-mobile/WordPress-Android/pull/18613] * [***] Block editor: Editor UX improvements with new icons, colors and additional design enhancements. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5985] 22.8 From 30966502ad35551b7f456d12b85289fe99f2349f Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 27 Jul 2023 16:23:27 +0200 Subject: [PATCH 18/18] Update Gutenberg Mobile ref with tag --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 469b00d36b25..d9735ad1aa28 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.1.0' automatticTracksVersion = '3.0.0' - gutenbergMobileVersion = '5874-be8917c55fb6bdc33dcd8e283b9f7e59f4fc1bad' + gutenbergMobileVersion = 'v1.101.0-alpha1' wordPressAztecVersion = 'v1.6.4' wordPressFluxCVersion = 'trunk-21f44db8f768fff12c7a85ee0531c7d9a53ba780' wordPressLoginVersion = '1.3.0'