Skip to content
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.

Sign up for GitHub

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

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −11
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3dafed
Upgrade Java version from react-native/android to Java 17
jchen351 Dec 10, 2024
07713a5
Update minSdkVersion to 24
jchen351 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/react_native/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 6 additions & 2 deletions js/react_native/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion js/react_native/e2e/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
buildscript {
ext {
buildToolsVersion = "29.0.2"
minSdkVersion = 21
minSdkVersion = 24
compileSdkVersion = 31
targetSdkVersion = 31
kotlinVersion = "1.5.30"
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/android/default_qnn_aar_build_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/android/training_full_aar_build_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/js/react_native_e2e_full_aar_build_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading