Mobile: Upgrade to React Native 0.74.1 #10401
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -104,11 +104,11 @@ | |
| "[email protected]": "patch:react-native-vosk@npm%3A0.1.12#./.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch", | ||
| "eslint": "patch:[email protected]#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch", | ||
| "[email protected]": "patch:app-builder-lib@npm%3A24.4.0#./.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch", | ||
| "nanoid": "patch:nanoid@npm%3A3.3.7#./.yarn/patches/nanoid-npm-3.3.7-98824ba130.patch", | ||
| "pdfjs-dist": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch", | ||
| "@react-native-community/slider": "patch:@react-native-community/slider@npm%3A4.4.4#./.yarn/patches/@react-native-community-slider-npm-4.4.4-d78e472f48.patch", | ||
| "husky": "patch:husky@npm%3A3.1.0#./.yarn/patches/husky-npm-3.1.0-5cc13e4e34.patch", | ||
| "chokidar@^2.0.0": "3.5.3", | ||
| "[email protected]": "patch:react-native@npm%3A0.74.1#./.yarn/patches/react-native-npm-0.74.1-754c02ae9e.patch" | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| source 'https://rubygems.org' | ||
|
|
||
| # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version | ||
| ruby ">= 2.6.10" | ||
|
|
||
| # Cocoapods 1.15 introduced a bug which breaks the build. We will remove the upper | ||
| # bound in the template on Cocoapods with next React Native release. | ||
| gem 'cocoapods', '>= 1.13', '< 1.15' | ||
| gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,28 @@ | ||
| apply plugin: "com.android.application" | ||
| apply plugin: "org.jetbrains.kotlin.android" | ||
| apply plugin: "com.facebook.react" | ||
|
|
||
| /** | ||
| * This is the configuration block to customize your React Native Android app. | ||
| * By default you don't need to apply any configuration, just uncomment the lines you need. | ||
| */ | ||
| react { | ||
| /* Folders */ | ||
| // The root of your project, i.e. where "package.json" lives. Default is '..' | ||
| // root = file("../") | ||
| // The folder where the react-native NPM package is. Default is ../node_modules/react-native | ||
| // reactNativeDir = file("../node_modules/react-native") | ||
| // The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen | ||
| // codegenDir = file("../node_modules/@react-native/codegen") | ||
| // The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js | ||
| // cliFile = file("../node_modules/react-native/cli.js") | ||
|
|
||
| /* Variants */ | ||
| // The list of variants to that are debuggable. For those we're going to | ||
| // skip the bundling of the JS bundle and the assets. By default is just 'debug'. | ||
| // If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants. | ||
| // debuggableVariants = ["liteDebug", "prodDebug"] | ||
|
|
||
| /* Bundling */ | ||
| // A list containing the node command and its flags. Default is just 'node'. | ||
| // nodeExecutableAndArgs = ["node"] | ||
|
|
@@ -42,6 +42,7 @@ react { | |
| // A list of extra flags to pass to the 'bundle' commands. | ||
| // See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle | ||
| // extraPackagerArgs = [] | ||
|
|
||
| /* Hermes Commands */ | ||
| // The hermes compiler command to run. By default it is 'hermesc' | ||
| // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc" | ||
|
|
@@ -50,14 +51,6 @@ react { | |
| // hermesFlags = ["-O", "-output-source-map"] | ||
| } | ||
|
|
||
| /** | ||
| * Set this to true to Run Proguard on Release builds to minify the Java bytecode. | ||
| */ | ||
|
|
@@ -74,36 +67,12 @@ def enableProguardInReleaseBuilds = false | |
| * give correct results when using with locales other than en-US. Note that | ||
| * this variant is about 6MiB larger per architecture than default. | ||
| */ | ||
|
Comment on lines
-87
to
-90
There was a problem hiding this comment. This code was removed upstream. See android/app/build.gradle in the upgrade diff. |
||
| def jscFlavor = 'org.webkit:android-jsc:+' | ||
|
|
||
| android { | ||
| ndkVersion rootProject.ext.ndkVersion | ||
| buildToolsVersion rootProject.ext.buildToolsVersion | ||
| compileSdk rootProject.ext.compileSdkVersion | ||
|
|
||
| namespace "net.cozic.joplin" | ||
| defaultConfig { | ||
|
|
@@ -120,17 +89,7 @@ android { | |
| missingDimensionStrategy 'react-native-camera', 'general' | ||
|
|
||
| // Needed to fix: The number of method references in a .dex file cannot exceed 64K | ||
| multiDexEnabled true | ||
| } | ||
| signingConfigs { | ||
| debug { | ||
|
|
@@ -147,7 +106,7 @@ android { | |
| keyPassword JOPLIN_RELEASE_KEY_PASSWORD | ||
| } | ||
| } | ||
| } | ||
| buildTypes { | ||
| debug { | ||
| signingConfig signingConfigs.debug | ||
|
|
@@ -160,32 +119,6 @@ android { | |
| proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
|
|
@@ -195,27 +128,14 @@ dependencies { | |
| exclude group: 'com.google.android.gms', module: 'play-services-vision' | ||
| } | ||
|
|
||
| // The version of react-native is set by the React Native Gradle Plugin | ||
| implementation("com.facebook.react:react-android") | ||
|
|
||
| if (hermesEnabled.toBoolean()) { | ||
| implementation("com.facebook.react:hermes-android") | ||
| } else { | ||
| implementation jscFlavor | ||
| } | ||
| } | ||
|
|
||
| apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package net.cozic.joplin | ||
|
|
||
| import com.facebook.react.ReactActivity | ||
| import com.facebook.react.ReactActivityDelegate | ||
| import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled | ||
| import com.facebook.react.defaults.DefaultReactActivityDelegate | ||
|
|
||
| class MainActivity : ReactActivity() { | ||
|
|
||
| /** | ||
| * Returns the name of the main component registered from JavaScript. This is used to schedule | ||
| * rendering of the component. | ||
| */ | ||
| override fun getMainComponentName(): String = "Joplin" | ||
|
|
||
| /** | ||
| * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate] | ||
| * which allows you to enable New Architecture with a single boolean flags [fabricEnabled] | ||
| */ | ||
| override fun createReactActivityDelegate(): ReactActivityDelegate = | ||
| DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled) | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We no longer use JSC. Hermes should support Intl natively.