Merge branch 'Cjian/jdk17-js' into Cjian/java_gradle

microsoft · Nov 15, 2024 · 167e6c4 · 167e6c4
2 parents 4bb8789 + 93fc5ef
commit 167e6c4
Show file tree

Hide file tree

Showing 12 changed files with 220 additions and 164 deletions.
diff --git a/js/react_native/android/build.gradle b/js/react_native/android/build.gradle
@@ -127,8 +127,8 @@ android {
     disable 'GradleCompatible'
   }
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 
   sourceSets {

diff --git a/js/react_native/android/gradle.properties b/js/react_native/android/gradle.properties
@@ -14,6 +14,6 @@ org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
 android.enableJetifier=true
 android.useAndroidX=true
 OnnxruntimeModule_buildToolsVersion=29.0.2
-OnnxruntimeModule_compileSdkVersion=31
-OnnxruntimeModule_minSdkVersion=21
-OnnxruntimeModule_targetSdkVersion=31
+OnnxruntimeModule_compileSdkVersion=34
+OnnxruntimeModule_minSdkVersion=24
+OnnxruntimeModule_targetSdkVersion=34
diff --git a/js/react_native/android/gradle/wrapper/gradle-wrapper.properties b/js/react_native/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/js/react_native/e2e/android/app/build.gradle b/js/react_native/e2e/android/app/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.application"
+plugins {
+    id 'com.android.application'
+}
 
 import com.android.build.OutputFile
 
@@ -123,8 +125,8 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {

diff --git a/js/react_native/e2e/android/build.gradle b/js/react_native/e2e/android/build.gradle
@@ -3,17 +3,17 @@
 buildscript {
     ext {
         buildToolsVersion = "29.0.2"
-        minSdkVersion = 21
-        compileSdkVersion = 31
-        targetSdkVersion = 31
+        minSdkVersion = 24
+        compileSdkVersion = 34
+        targetSdkVersion = 34
         kotlinVersion = "1.5.30"
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:7.1.1')
+        classpath('com.android.tools.build:gradle:7.4.2')
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/js/react_native/e2e/android/gradle/wrapper/gradle-wrapper.jar b/js/react_native/e2e/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/js/react_native/e2e/android/gradle/wrapper/gradle-wrapper.properties b/js/react_native/e2e/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.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