Migrate yarn to npm

java/build-android.gradle

@@ -56,7 +56,7 @@ allprojects {
 }
 
 android {
-	compileSdkVersion 32
+	compileSdkVersion 33
 
 	defaultConfig {
 		minSdkVersion minSdkVer

java/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

java/gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

java/src/test/android/app/build.gradle

@@ -6,7 +6,7 @@ plugins {
 def minSdkVer = System.properties.get("minSdkVer")?:24
 
 android {
-	compileSdkVersion 32
+	compileSdkVersion 33
 
 	defaultConfig {
 		applicationId "ai.onnxruntime.example.javavalidator"

js/README.md

@@ -361,7 +361,7 @@ From ORT v1.19 onwards, the ONNX Runtime Mobile packages are no longer published
    From `<ORT_ROOT>/js/react_native,
 
    ```sh
-   yarn bootstrap
+   npm run bootstrap
    ```
 
    When testing with a custom built ONNX Runtime Android package, copy `<BUILD_DIRECTORY>/aar_out/MinSizeRel/com/microsoft/onnxruntime/onnxruntime-android/<version>/onnxruntime-android-<version>.aar` into the `<ORT_ROOT>/js/react_native/e2e/android/app/libs` directory.
@@ -377,7 +377,7 @@ From ORT v1.19 onwards, the ONNX Runtime Mobile packages are no longer published
     Install detox command line tools:
 
     ```
-    yarn global add detox-cli
+    npm install -g detox-cli
     ```
 
     Install applesimutils which is required by Detox to work with iOS simulators. (Requires a MacOS device)
@@ -439,13 +439,13 @@ From ORT v1.19 onwards, the ONNX Runtime Mobile packages are no longer published
     To record logs for testing results, add `--record-logs`. Output logs and test results will be produced in the `e2e/artifacts/` folder.
     See: [Detox/logger#artifacts](https://wix.github.io/Detox/docs/api/logger#artifacts)
 
-    **_`yarn bootstrap` changes `packages.json` and `yarn.lock` files. Once testing is done, restore changes to avoid unwanted commit._**
+    **_`npm run bootstrap` changes `packages.json` and `pacakge-lock.json` files. Once testing is done, restore changes to avoid unwanted commit._**
 
 5. Run Android and iOS apps.
 
    ```sh
-   yarn e2e android
-   yarn e2e ios
+   npm run e2e:android
+   npm run e2e:ios
    ```
 
 ### NPM Packaging
@@ -460,4 +460,4 @@ From ORT v1.19 onwards, the ONNX Runtime Mobile packages are no longer published
 
 ### Distribution
 
-It should be able to consumed by React Native projects that uses Yarn packages through `yarn add onnxruntime-react-native`.
+It should be able to consumed by React Native projects that uses npm packages through `npm install onnxruntime-react-native`.

js/react_native/README.md

@@ -13,7 +13,7 @@ With ONNX Runtime React Native, React Native developers can score pre-trained ON
 ### Installation
 
 ```sh
-yarn add onnxruntime-react-native
+npm install onnxruntime-react-native
 ```
 
 ### Usage

js/react_native/android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.2'
+    classpath 'com.android.tools.build:gradle:7.4.2'
     // noinspection DifferentKotlinGradleVersion
   }
 }
@@ -70,6 +70,7 @@ def REACT_NATIVE_VERSION = ['node', '--print', "JSON.parse(require('fs').readFil
 def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
 
 android {
+  namespace 'ai.onnxruntime.reactnative'
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
   defaultConfig {
@@ -141,6 +142,7 @@ android {
       }
     }
   }
+    ndkVersion '27.0.12077973'
 }
 
 repositories {

js/react_native/android/gradle.properties

@@ -14,6 +14,6 @@
 android.enableJetifier=true
 android.useAndroidX=true
 OnnxruntimeModule_buildToolsVersion=29.0.2
-OnnxruntimeModule_compileSdkVersion=31
-OnnxruntimeModule_minSdkVersion=21
-OnnxruntimeModule_targetSdkVersion=31
+OnnxruntimeModule_compileSdkVersion=33
+OnnxruntimeModule_minSdkVersion=23
+OnnxruntimeModule_targetSdkVersion=33

js/react_native/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,9 @@
+#Tue Sep 24 11:35:00 PDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists