diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index d408400d..24f08fd9 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -9,10 +9,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: set up JDK 17 + - name: set up JDK 21 uses: actions/setup-java@v2 with: - java-version: '17' + java-version: '21' distribution: 'adopt' - name: Repo Visualizer uses: githubocto/repo-visualizer@0.8.2 @@ -27,10 +27,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: set up JDK 17 + - name: set up JDK 21 uses: actions/setup-java@v2 with: - java-version: '17' + java-version: '21' distribution: 'adopt' - name: build app apk run: ./gradlew :app:assembleChargeRelease; diff --git a/app/build.gradle b/app/build.gradle index 2fff463a..3dee96aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -105,8 +105,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } testOptions { diff --git a/build.gradle b/build.gradle index ada9688d..ef9092c3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.6.0' apply false - id 'com.android.library' version '8.6.0' apply false + id 'com.android.application' version '8.7.0' apply false + id 'com.android.library' version '8.7.0' apply false id 'org.jetbrains.kotlin.android' version '2.0.20' apply false id 'com.google.devtools.ksp' version '2.0.10-1.0.24' apply false } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 1ec533d7..75204802 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -9,7 +9,7 @@ dependencies { // implementation localGroovy() implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.0' // 添加了这个,就可以看 Android Gradle 插件的源码了 - implementation 'com.android.tools.build:gradle-api:8.6.0' + implementation 'com.android.tools.build:gradle-api:8.7.0' // implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.40" implementation 'com.google.code.gson:gson:2.11.0' implementation 'com.android.tools:common:31.6.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ea3f57c7..1412a20f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip diff --git a/imitate/build.gradle b/imitate/build.gradle index cf7f0a32..a0cd772d 100644 --- a/imitate/build.gradle +++ b/imitate/build.gradle @@ -76,11 +76,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } kotlinOptions { - jvmTarget = '17' + jvmTarget = '21' } buildFeatures { viewBinding true diff --git a/subs/ai/build.gradle b/subs/ai/build.gradle index 631a42fd..f5de4535 100644 --- a/subs/ai/build.gradle +++ b/subs/ai/build.gradle @@ -28,11 +28,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } kotlinOptions { - jvmTarget = '17' + jvmTarget = '21' } androidResources { noCompress = 'tflite' diff --git a/subs/cpp_native/build.gradle b/subs/cpp_native/build.gradle index adcbb0cc..0c8ebad9 100644 --- a/subs/cpp_native/build.gradle +++ b/subs/cpp_native/build.gradle @@ -30,8 +30,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } externalNativeBuild { cmake { diff --git a/subs/dataview/build.gradle b/subs/dataview/build.gradle index 93d7515c..53701609 100644 --- a/subs/dataview/build.gradle +++ b/subs/dataview/build.gradle @@ -22,8 +22,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } namespace 'com.engineer.dateview' diff --git a/subs/game/build.gradle b/subs/game/build.gradle index db39d315..fe573ac8 100644 --- a/subs/game/build.gradle +++ b/subs/game/build.gradle @@ -20,8 +20,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } sourceSets { diff --git a/subs/gif-revert/build.gradle b/subs/gif-revert/build.gradle index e94fe691..5ea1132e 100644 --- a/subs/gif-revert/build.gradle +++ b/subs/gif-revert/build.gradle @@ -16,8 +16,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } buildTypes {