Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Gutenberg] Upgrade React Native 0.71.11 #18613

Merged
merged 26 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e9a0213
Update React Native version and use new modules
fluiddot Jun 7, 2023
be0b54c
Bump Android Gradle plugin version
fluiddot Jun 7, 2023
50feeda
Update Gutenberg Mobile ref
fluiddot Jun 16, 2023
7391c76
Merge branch 'trunk' into gutenberg/upgrade/react-native-0.71
fluiddot Jun 16, 2023
238a47d
Update Gutenberg Mobile ref
fluiddot Jun 16, 2023
88f817b
build: Update React Native to 0.71.11
dcalhoun Jun 19, 2023
dc11629
Revert "Bump Android Gradle plugin version"
dcalhoun Jun 21, 2023
c6a1e8b
build: Update Gutenberg ref
dcalhoun Jun 21, 2023
99ee496
Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android…
dcalhoun Jun 21, 2023
db463fa
Update Gutenberg Mobile ref
fluiddot Jun 30, 2023
8aa6ccb
Merge branch 'trunk' into gutenberg/upgrade/react-native-0.71
fluiddot Jun 30, 2023
6bf2946
Update Gutenberg Mobile ref
fluiddot Jul 4, 2023
3556bb3
Merge branch 'trunk' into gutenberg/upgrade/react-native-0.71
fluiddot Jul 4, 2023
3a1cada
Merge branch 'trunk' into gutenberg/upgrade/react-native-0.71
fluiddot Jul 4, 2023
f1ce5ca
build: Update Gutenberg ref
dcalhoun Jul 4, 2023
802c84d
Merge branch 'trunk' into gutenberg/upgrade/react-native-0.71
fluiddot Jul 19, 2023
a9d41af
Update Gutenberg Mobile ref
fluiddot Jul 20, 2023
e23a59a
Update release notes
fluiddot Jul 20, 2023
d1d634b
Update Gutenberg Mobile ref
fluiddot Jul 21, 2023
8404070
Merge branch 'trunk' into gutenberg/upgrade/react-native-0.71
fluiddot Jul 21, 2023
93d2baa
Add new React Native modules to Dependabot's ignore list
fluiddot Jul 21, 2023
b751ec2
Exclude new React Native modules when using local GB-mobile path
fluiddot Jul 21, 2023
3a63150
build: Update Gutenberg ref
dcalhoun Jul 27, 2023
8e19ace
Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android…
dcalhoun Jul 27, 2023
ec16a99
Update release notes
fluiddot Jul 27, 2023
3096650
Update Gutenberg Mobile ref with tag
fluiddot Jul 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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]
* [***] Block editor: Editor UX improvements with new icons, colors and additional design enhancements. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5985]

22.8
Expand Down
7 changes: 2 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ext {
automatticRestVersion = '1.0.8'
automatticStoriesVersion = '2.1.0'
automatticTracksVersion = '3.0.0'
gutenbergMobileVersion = 'v1.100.1'
gutenbergMobileVersion = '5874-77f2c68803c6b069c91932206b38e6f07da58570'
wordPressAztecVersion = 'v1.6.4'
wordPressFluxCVersion = '2.37.0'
wordPressLoginVersion = '1.3.0'
Expand Down Expand Up @@ -81,10 +81,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.11'

// test
assertjVersion = '3.23.1'
Expand Down
19 changes: 6 additions & 13 deletions libs/editor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,25 +68,18 @@ 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.
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'
Comment on lines 79 to 80
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, we don't need these modules from the previous RN version (i.e. 0.69.4). However, I'm experiencing Duplicate class errors when building if I remove them. Seems that the fact that some of the React Native third-party libraries (especially the forked repositories) are still pointing to RN 0.69.4, has to do with this issue.

exclude module: 'hermes-android'
exclude module: 'react-android'
}

implementation "org.wordpress:utils:$wordPressUtilsVersion"
Expand Down