Skip to content

Commit

Permalink
Merge branch 'Cjian/jdk17-js' into Cjian/gradle
Browse files Browse the repository at this point in the history
# Conflicts:
#	js/react_native/android/gradle.properties
#	js/react_native/e2e/android/build.gradle
#	js/react_native/e2e/android/gradle/wrapper/gradle-wrapper.properties
#	tools/ci_build/github/android/training_full_aar_build_settings.json
#	tools/ci_build/github/js/react_native_e2e_full_aar_build_settings.json
  • Loading branch information
jchen351 committed Nov 15, 2024
2 parents 2aa8e0b + 93fc5ef commit f32cc6f
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 18 deletions.
4 changes: 2 additions & 2 deletions js/react_native/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,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
6 changes: 3 additions & 3 deletions js/react_native/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ 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

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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions js/react_native/e2e/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,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 {
Expand Down
10 changes: 5 additions & 5 deletions js/react_native/e2e/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

buildscript {
ext {
buildToolsVersion = "34.0.0"
minSdkVersion = 29
compileSdkVersion = 33
targetSdkVersion = 33
kotlinVersion = '1.8.10'
buildToolsVersion = "29.0.2"
minSdkVersion = 24
compileSdkVersion = 34
targetSdkVersion = 34
kotlinVersion = "1.5.30"
}
repositories {
google()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
Expand Down
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": 34,
"build_params": [
"--enable_lto",
"--android",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"x86_64"
],
"android_min_sdk_version": 24,
"android_target_sdk_version": 33,
"android_target_sdk_version": 34,
"build_params": [
"--enable_lto",
"--android",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"x86_64"
],
"android_min_sdk_version": 24,
"android_target_sdk_version": 33,
"android_target_sdk_version": 34,
"build_params": [
"--android",
"--parallel",
Expand Down

0 comments on commit f32cc6f

Please sign in to comment.