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

Jump to bottom

Update gradle version to 8.7 #22206

Open
wants to merge 56 commits into
base: main
Choose a base branch
from
Open

Update gradle version to 8.7 #22206

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
50981a1
Update gradle version to 8.10.2
jchen351 Sep 24, 2024
54cce11
update setting.gradle
jchen351 Sep 24, 2024
a7b1370
Update gradle-wrapper.properties in java project.
jchen351 Sep 24, 2024
2d09024
com.android.tools.build:gradle:8.6.0
jchen351 Sep 24, 2024
70308f4
com.android.tools.build:gradle:8.6.1
jchen351 Sep 24, 2024
82ab4ee
com.android.tools.build:gradle:8.6.1
jchen351 Sep 24, 2024
876eb4a
com.android.tools.build:gradle:8.6.1
jchen351 Sep 24, 2024
9b60ae7
com.android.tools.build:gradle:8.6.1
jchen351 Sep 24, 2024
aa613aa
com.android.tools.build:gradle:8.6.1
jchen351 Sep 25, 2024
c5baa3b
Use JDK 17 for andriod-java-api-aar.yml
jchen351 Sep 25, 2024
963f379
Use JDK 17 for android-binary-size-check-stage.yml
jchen351 Sep 25, 2024
0f7003b
downgrade com.android.tools.build:gradle:8.6.1 to 7.4.2
jchen351 Sep 25, 2024
53dc498
Rolling back android/src/main/AndroidManifest.xml
jchen351 Sep 25, 2024
ccc3028
npm run format
jchen351 Sep 25, 2024
8fbf193
Rolling back packages
jchen351 Sep 25, 2024
ab98a79
Undo changes on tools/ci_build/github/azure-pipelines/templates/andro…
jchen351 Sep 30, 2024
b1c2f9c
Merge branch 'main' into Cjian/gradle
jchen351 Sep 30, 2024
7da268d
Merge branch 'main' into Cjian/gradle
jchen351 Oct 1, 2024
485de16
Increase -Xmx6144M
jchen351 Oct 1, 2024
feff4ca
Increase -Xmx6144M
jchen351 Oct 2, 2024
9a7d008
Increase -Xmx6144M
jchen351 Oct 2, 2024
44ca723
update minSdkVersion to 29 and sdk version to 34
jchen351 Oct 2, 2024
6d6fda5
Update kotlinVersion
jchen351 Oct 2, 2024
0edd95f
ADD registerReceiver Override method
jchen351 Oct 2, 2024
228c0b3
targetSdkVersion to 33
jchen351 Oct 2, 2024
2b2cfc8
android-31
jchen351 Oct 2, 2024
f1de779
buildToolsVersion to 34
jchen351 Oct 2, 2024
e3bb6b8
Merge branch 'main' into Cjian/gradle
jchen351 Oct 3, 2024
7412aeb
Merge with the master
jchen351 Oct 3, 2024
6c2e71d
android_api=33
jchen351 Oct 3, 2024
33ee3ee
Update uses-permission and core-ktx version
jchen351 Oct 3, 2024
8f02cbb
Force kotlin version to 1.8.10
jchen351 Oct 3, 2024
1a6e6ab
revert tools/ci_build/github/azure-pipelines/templates/android-binary…
jchen351 Oct 4, 2024
856ac62
Swtiching min sdk back to 24
jchen351 Oct 4, 2024
52a52b2
"android_min_sdk_version": 24,
jchen351 Oct 4, 2024
22c0a9a
DEFAULT_ANDROID_MIN_SDK_VER = 24
jchen351 Oct 4, 2024
870b48b
Update version to use VERSION NUMBER
jchen351 Oct 7, 2024
84271dc
comment out
jchen351 Oct 8, 2024
d5c5829
Adding rootProject.file('../../../../VERSION_NUMBER').text.trim()
jchen351 Oct 10, 2024
a50f645
Merge branch 'main' into Cjian/gradle
jchen351 Oct 14, 2024
25be09e
Add debug info into Build React Native Detox Android e2e Tests
jchen351 Oct 14, 2024
797bdc6
Update FLIPPER_VERSION=0.99.0
jchen351 Oct 14, 2024
c9ee66e
implementation "com.microsoft.onnxruntime:onnxruntime-android:lates…
jchen351 Oct 14, 2024
4349764
Update kotlin version ro 1.8.10
jchen351 Oct 14, 2024
cbb0f79
Update kotlin version ro 1.8.10
jchen351 Oct 15, 2024
0280f7e
accessExternalSchema issue
jchen351 Oct 15, 2024
3cd92d1
accessExternalSchema issue
jchen351 Oct 15, 2024
3387f33
apply plugin: 'com.android.library'
jchen351 Oct 15, 2024
e540496
apply plugin: 'com.android.library'
jchen351 Oct 15, 2024
93fc5ef
Update Android SDK version to 34 in gradle.properties.
jchen351 Nov 15, 2024
2aa8e0b
Merge remote-tracking branch 'origin/main' into Cjian/gradle
jchen351 Nov 15, 2024
f32cc6f
Merge branch 'Cjian/jdk17-js' into Cjian/gradle
jchen351 Nov 15, 2024
dba1505
Update Android system image version from 33 to 34.
jchen351 Nov 15, 2024
0239015
Update JVM arguments in gradle.properties for React Native Android pr…
jchen351 Nov 15, 2024
02ad09f
Merge branch 'Cjian/jdk17-js' into Cjian/gradle
jchen351 Nov 15, 2024
54c6d5c
Add option to disable Bluetooth in Android emulator.
jchen351 Nov 15, 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
2 changes: 1 addition & 1 deletion java/build-android.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ allprojects {
}

android {
compileSdkVersion 32
compileSdkVersion 33

defaultConfig {
minSdkVersion minSdkVer
Expand Down
Binary file modified java/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions java/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions java/gradlew.bat
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes from this file is generated by ./gradlew wrapper --gradle-version=8.10.2 --distribution-type=bin

Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

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

goto fail

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

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
12 changes: 6 additions & 6 deletions java/src/test/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ plugins {
id 'kotlin-android'
}

def minSdkVer = System.properties.get("minSdkVer")?:24
def minSdkVer = System.properties.get("minSdkVer")?:29

android {
compileSdkVersion 32
compileSdkVersion 33

defaultConfig {
applicationId "ai.onnxruntime.example.javavalidator"
minSdkVersion minSdkVer
targetSdkVersion 32
targetSdkVersion 33
versionCode 1
versionName "1.0"

Expand All @@ -37,13 +37,13 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation(name: "onnxruntime-android", ext: "aar")

androidTestImplementation 'androidx.test:runner:1.4.0'
Expand Down
3 changes: 1 addition & 2 deletions java/src/test/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
Expand All @@ -16,5 +16,4 @@
</intent-filter>
</activity>
</application>

</manifest>
2 changes: 1 addition & 1 deletion java/src/test/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx6144M -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
Expand Down
2 changes: 1 addition & 1 deletion js/react_native/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.android.tools.build:gradle:7.4.2'
// noinspection DifferentKotlinGradleVersion
}
}
Expand Down
10 changes: 5 additions & 5 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=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
#
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand All @@ -13,7 +13,7 @@
#Tue Jan 26 17:36:02 PST 2021
android.enableJetifier=true
android.useAndroidX=true
OnnxruntimeModule_buildToolsVersion=29.0.2
OnnxruntimeModule_compileSdkVersion=31
OnnxruntimeModule_minSdkVersion=21
OnnxruntimeModule_targetSdkVersion=31
OnnxruntimeModule_buildToolsVersion=34.0.0
OnnxruntimeModule_compileSdkVersion=33
OnnxruntimeModule_minSdkVersion=29
OnnxruntimeModule_targetSdkVersion=33
Binary file modified js/react_native/android/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
6 changes: 4 additions & 2 deletions js/react_native/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.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
Loading
Loading