Skip to content

Commit 632a36a

Browse files
jchen351jchen351
authored
Update Gradle version 8.7 and java version 17 within onnxruntime/java (microsoft#22771)
### Description This change is to update the Gradle version within java project to 8.7, it also upgrades the JAVA to 17. Gradle version from react-native was also updated to 7.5 to make it compatible with changes from the Java directory. However, the target java version remains the same. Java version from these will be upgraded in a separated PR. This is spited from microsoft#22206 ### Motivation and Context This is the first step to upgrade the react native version.
1 parent 0733733 commit 632a36a

File tree

14 files changed

+199
-159
lines changed

14 files changed

+199
-159
lines changed

‎java/build-android.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ allprojects {
8282
}
8383

8484
android {
85-
compileSdkVersion 32
85+
compileSdkVersion 34
8686

8787
defaultConfig {
8888
minSdkVersion minSdkVer
@@ -108,8 +108,8 @@ android {
108108
}
109109

110110
compileOptions {
111-
sourceCompatibility = JavaVersion.VERSION_1_8
112-
targetCompatibility = JavaVersion.VERSION_1_8
111+
sourceCompatibility = JavaVersion.VERSION_17
112+
targetCompatibility = JavaVersion.VERSION_17
113113
}
114114

115115
sourceSets {

‎java/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ mavenSettings {
5050
}
5151

5252
java {
53-
sourceCompatibility = JavaVersion.VERSION_1_8
54-
targetCompatibility = JavaVersion.VERSION_1_8
53+
sourceCompatibility = JavaVersion.VERSION_17
54+
targetCompatibility = JavaVersion.VERSION_17
5555
}
5656

5757
// This jar tasks serves as a CMAKE signaling

‎java/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎java/gradlew.bat

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
4343
%JAVA_EXE% -version >NUL 2>&1
4444
if %ERRORLEVEL% equ 0 goto execute
4545

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
46+
echo. 1>&2
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
48+
echo. 1>&2
49+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
50+
echo location of your Java installation. 1>&2
5151

5252
goto fail
5353

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5757

5858
if exist "%JAVA_EXE%" goto execute
5959

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
60+
echo. 1>&2
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
62+
echo. 1>&2
63+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
64+
echo location of your Java installation. 1>&2
6565

6666
goto fail
6767

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ def minSdkVer = System.properties.get("minSdkVer")?:24
77
def qnnVersion = System.properties['qnnVersion']
88

99
android {
10-
compileSdkVersion 32
10+
compileSdkVersion 34
1111

1212
defaultConfig {
1313
applicationId "ai.onnxruntime.example.javavalidator"
1414
minSdkVersion minSdkVer
15-
targetSdkVersion 32
15+
targetSdkVersion 34
1616
versionCode 1
1717
versionName "1.0"
1818

@@ -34,11 +34,11 @@ android {
3434
}
3535
}
3636
compileOptions {
37-
sourceCompatibility JavaVersion.VERSION_1_8
38-
targetCompatibility JavaVersion.VERSION_1_8
37+
sourceCompatibility JavaVersion.VERSION_17
38+
targetCompatibility JavaVersion.VERSION_17
3939
}
4040
kotlinOptions {
41-
jvmTarget = '1.8'
41+
jvmTarget = '17'
4242
}
4343
// Conditional packagingOptions for QNN builds only
4444
if (qnnVersion != null) {

‎js/react_native/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.1.2'
10+
classpath 'com.android.tools.build:gradle:7.4.2'
1111
// noinspection DifferentKotlinGradleVersion
1212
}
1313
}

‎js/react_native/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Specifies the JVM arguments used for the daemon process.
55
# The setting is particularly useful for tweaking memory settings.
66
# Default value: -Xmx1024m -XX:MaxPermSize=256m
7-
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
7+
org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
88
#
99
# When configured, Gradle will run in incubating parallel mode.
1010
# This option should only be used with decoupled projects. More details, visit

‎js/react_native/android/gradle/wrapper/gradle-wrapper.jar

1.8 KB
Binary file not shown.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
3+
distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)