Skip to content

Commit

Permalink
Merge pull request #18613 from wordpress-mobile/gutenberg/upgrade/rea…
Browse files Browse the repository at this point in the history
…ct-native-0.71

[Gutenberg] Upgrade React Native `0.71.11`
  • Loading branch information
fluiddot authored Jul 27, 2023
2 parents 48da759 + 3096650 commit 1991d28
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 19 deletions.
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
2 changes: 1 addition & 1 deletion RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

23.0
-----

* [**] [internal] Upgrade React Native to 0.71.11 [https://github.com/wordpress-mobile/WordPress-Android/pull/18613]

22.9
-----
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 = 'v1.101.0-alpha1'
wordPressAztecVersion = 'v1.6.4'
wordPressFluxCVersion = 'trunk-21f44db8f768fff12c7a85ee0531c7d9a53ba780'
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'
exclude module: 'hermes-android'
exclude module: 'react-android'
}

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

0 comments on commit 1991d28

Please sign in to comment.