Upgrade Java version from react-native/android to Java 17

microsoft · Dec 10, 2024 · f3dafed · f3dafed
1 parent 5f7b9d0
commit f3dafed
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 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
@@ -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
+org.gradle.jvmargs=-Xmx4096m -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
@@ -15,5 +15,9 @@ android.enableJetifier=true
 android.useAndroidX=true
 OnnxruntimeModule_buildToolsVersion=29.0.2
 OnnxruntimeModule_compileSdkVersion=31
-OnnxruntimeModule_minSdkVersion=21
+OnnxruntimeModule_minSdkVersion=24
 OnnxruntimeModule_targetSdkVersion=31
+
+systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl
+systemProp.javax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
+systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
diff --git a/tools/ci_build/github/android/default_qnn_aar_build_settings.json b/tools/ci_build/github/android/default_qnn_aar_build_settings.json
@@ -2,8 +2,8 @@
     "build_abis": [
         "arm64-v8a"
     ],
-    "android_min_sdk_version": 21,
-    "android_target_sdk_version": 24,
+    "android_min_sdk_version": 24,
+    "android_target_sdk_version": 31,
     "build_params": [
         "--enable_lto",
         "--android",

diff --git a/tools/ci_build/github/android/training_full_aar_build_settings.json b/tools/ci_build/github/android/training_full_aar_build_settings.json
@@ -5,8 +5,8 @@
         "x86",
         "x86_64"
     ],
-    "android_min_sdk_version": 21,
-    "android_target_sdk_version": 24,
+    "android_min_sdk_version": 24,
+    "android_target_sdk_version": 31,
     "build_params": [
         "--enable_lto",
         "--android",

diff --git a/tools/ci_build/github/js/react_native_e2e_full_aar_build_settings.json b/tools/ci_build/github/js/react_native_e2e_full_aar_build_settings.json
@@ -2,8 +2,8 @@
     "build_abis": [
         "x86_64"
     ],
-    "android_min_sdk_version": 21,
-    "android_target_sdk_version": 24,
+    "android_min_sdk_version": 24,
+    "android_target_sdk_version": 31,
     "build_params": [
         "--android",
         "--parallel",