Upgrade React Native to 0.73 #23575

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

Merged

jchen351 merged 36 commits into main from Cjian/RN-73

Feb 26, 2025

js/react_native/android/gradle.properties

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,7 +4,7 @@
  
    # Specifies the JVM arguments used for the daemon process.

    # The setting is particularly useful for tweaking memory settings.

    # Default value: -Xmx1024m -XX:MaxPermSize=256m

    org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Djavax.xml.accessExternalSchema=all -Djavax.xml.accessExternalDTD=all

    org.gradle.jvmargs=-Xmx8192m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Djavax.xml.accessExternalSchema=all -Djavax.xml.accessExternalDTD=all

    #

    # When configured, Gradle will run in incubating parallel mode.

    # This option should only be used with decoupled projects. More details, visit

    @@ -13,7 +13,7 @@ org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
  
    #Tue Jan 26 17:36:02 PST 2021

    android.enableJetifier=true

    android.useAndroidX=true

    OnnxruntimeModule_buildToolsVersion=33.0.0

    OnnxruntimeModule_buildToolsVersion=34.0.0

    OnnxruntimeModule_compileSdkVersion=34

    OnnxruntimeModule_minSdkVersion=24

    OnnxruntimeModule_targetSdkVersion=34

js/react_native/babel.config.js

This file was deleted.

js/react_native/e2e/android/app/build.gradle

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,8 +1,7 @@
  
    apply plugin: "com.android.application"

    apply plugin: "org.jetbrains.kotlin.android"

    apply plugin: "com.facebook.react"

    import com.android.build.OutputFile

    /**

     * 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.

    @@ -13,8 +12,8 @@ react {
  
        // 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 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")

    @@ -52,14 +51,6 @@ react {
  
        // hermesFlags = ["-O", "-output-source-map"]

    }

    /**

     * Set this to true to create four separate APKs instead of one,

     * one for each native architecture. This is useful if you don't

     * use App Bundles (https://developer.android.com/guide/app-bundle/)

     * and want to have separate APKs to upload to the Play Store.

     */

    def enableSeparateBuildPerCPUArchitecture = false

    /**

     * Set this to true to Run Proguard on Release builds to minify the Java bytecode.

     */

    @@ -78,45 +69,33 @@ def enableProguardInReleaseBuilds = false
  
     */

    def jscFlavor = 'org.webkit:android-jsc:+'

    /**

     * Private function to get the list of Native Architectures you want to build.

     * This reads the value from reactNativeArchitectures in your gradle.properties

     * file and works together with the --active-arch-only flag of react-native run-android.

     */

    def reactNativeArchitectures() {

        def value = project.getProperties().get("reactNativeArchitectures")

        return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]

    }

    android {

    		buildToolsVersion rootProject.ext.buildToolsVersion

        compileSdkVersion rootProject.ext.compileSdkVersion

    		namespace "com.example.reactnativeonnxruntimemodule"

    		namespace "com.reactnativeonnxruntimemodule"

        compileOptions {

            sourceCompatibility JavaVersion.VERSION_17

            targetCompatibility JavaVersion.VERSION_17

        }

    	  packagingOptions {

    	    pickFirst '**/libc++_shared.so'

    	    pickFirst '**/libfbjni.so'

    	    excludes = [

    	      "META-INF",

    	      "META-INF/**",

    	    ]

    		}

        defaultConfig {

            applicationId "com.example.reactnativeonnxruntimemodule"

            applicationId "com.reactnativeonnxruntimemodule"

            minSdkVersion rootProject.ext.minSdkVersion

            targetSdkVersion rootProject.ext.targetSdkVersion

            versionCode 1

            versionName "1.0"

            testBuildType System.getProperty('testBuildType', 'debug')

            testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

        }

        splits {

            abi {

                reset()

                enable enableSeparateBuildPerCPUArchitecture

                universalApk false  // If true, also generate a universal APK

                include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"

            }

        }

        signingConfigs {

            debug {

                storeFile rootProject.file('debug.keystore')

    @@ -135,20 +114,6 @@ android {
  
                proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"

            }

        }

        // applicationVariants are e.g. debug, release

        applicationVariants.all { variant ->

            variant.outputs.each { output ->

                // For each separate APK per architecture, set a unique version code as described here:

                // https://developer.android.com/studio/build/configure-apk-splits.html

                def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]

                def abi = output.getFilter(OutputFile.ABI)

                if (abi != null) {  // null for the universal-debug, universal-release variants

                    output.versionCodeOverride =

                            versionCodes.get(abi) * 1048576 + defaultConfig.versionCode

                }

            }

        }

    }

    repositories {

    @@ -164,19 +129,8 @@ dependencies {
  
        implementation fileTree(dir: "libs", include: ["*.jar"])

        // The version of react-native is set by the React Native Gradle Plugin

        implementation("com.facebook.react:react-android")

        implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"

    		implementation("com.facebook.react:flipper-integration")

        implementation 'androidx.test.ext:junit:1.1.5'

        debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {

          exclude group:'com.facebook.fbjni'

        }

        debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {

            exclude group:'com.facebook.flipper'

            exclude group:'com.squareup.okhttp3', module:'okhttp'

        }

        debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {

            exclude group:'com.facebook.flipper'

        }

        if (hermesEnabled.toBoolean()) {

            implementation("com.facebook.react:hermes-android")

    @@ -188,7 +142,7 @@ dependencies {
  
        androidTestImplementation "androidx.test:runner:1.5.2"

        androidTestImplementation "androidx.test:rules:1.5.0"

        implementation project(':onnxruntime-react-native')

        implementation (project(':onnxruntime-react-native'))

        // specify ORT dependency here so it can be found in libs flatDir repository

        implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar"

    }

...actnativeonnxruntimemodule/DetoxTest.java → ...actnativeonnxruntimemodule/DetoxTest.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     // Detox requires the project to have a single dummy native Android Test with some special content,
     // which will be picked up by the testRunner.
-    package com.example.reactnativeonnxruntimemodule;
+    package com.reactnativeonnxruntimemodule;
     import android.content.Intent;
@@ Expand Down @@

js/react_native/e2e/android/app/src/debug/AndroidManifest.xml

This file was deleted.

...droid/app/src/debug/java/com/example/reactnativeonnxruntimemodule/ReactNativeFlipper.java

This file was deleted.

js/react_native/e2e/android/app/src/main/AndroidManifest.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,6 @@ @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
           </activity>
-          <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
         </application>
     </manifest>

.../e2e/android/app/src/main/java/com/example/reactnativeonnxruntimemodule/MainActivity.java

This file was deleted.

...e/android/app/src/main/java/com/example/reactnativeonnxruntimemodule/MainApplication.java

This file was deleted.

...onnxruntimemodule/DataHandlerPackage.java → ...onnxruntimemodule/DataHandlerPackage.java

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     // Copyright (c) Microsoft Corporation. All rights reserved.
     // Licensed under the MIT License.
-    package com.example.reactnativeonnxruntimemodule;
+    package com.reactnativeonnxruntimemodule;
     import com.facebook.react.ReactPackage;
     import com.facebook.react.bridge.NativeModule;
@@ Expand Down @@

...veonnxruntimemodule/MNISTDataHandler.java → ...veonnxruntimemodule/MNISTDataHandler.java

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     // Copyright (c) Microsoft Corporation. All rights reserved.
     // Licensed under the MIT License.
-    package com.example.reactnativeonnxruntimemodule;
+    package com.reactnativeonnxruntimemodule;
     import static java.util.stream.Collectors.joining;
@@ Expand Down Expand Up @@
         final int imageHeight = 28;
         final int imageWidth = 28;
-        InputStream is = MainApplication.getAppContext().getContentResolver().openInputStream(Uri.parse(uri));
+        InputStream is = reactContext.getContentResolver().openInputStream(Uri.parse(uri));
         BufferedInputStream bis = new BufferedInputStream(is);
         byte[] imageArray = new byte[bis.available()];
         bis.read(imageArray);
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade React Native to 0.73 #23575

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!