Skip to content

Commit 038ffe1

Browse files
renovate[bot]daohoangsonclaude
authored
Update Android toolchain (#1518)
- Gradle 9.3.1 - AGP 8.13.2 (9.x blocked by plugin incompatibility) - Kotlin 2.3.10 (migrated to compilerOptions DSL) - gradle/actions 5.0.1 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dao Hoang Son <daohoangson@gmail.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent e7f15f7 commit 038ffe1

5 files changed

Lines changed: 9 additions & 7 deletions

File tree

.github/workflows/demo_app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
2929
with:
3030
cache: true
31-
- uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
31+
- uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
3232
- run: echo JAVA_HOME=$JAVA_HOME_17_X64 >> $GITHUB_ENV
3333

3434
- run: flutter build apk --debug

.github/workflows/integration_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
2424
with:
2525
cache: true
26-
- uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
26+
- uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
2727
with:
2828
# only update gradle cache from demo_app.yml jobs
2929
cache-read-only: true

demo_app/android/app/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ android {
1818
targetCompatibility = JavaVersion.VERSION_11
1919
}
2020

21-
kotlinOptions {
22-
jvmTarget = JavaVersion.VERSION_11.toString()
21+
kotlin {
22+
compilerOptions {
23+
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11
24+
}
2325
}
2426

2527
defaultConfig {

demo_app/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip

demo_app/android/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21-
id("com.android.application") version "8.13.1" apply false
22-
id("org.jetbrains.kotlin.android") version "2.2.21" apply false
21+
id("com.android.application") version "8.13.2" apply false
22+
id("org.jetbrains.kotlin.android") version "2.3.10" apply false
2323
}
2424

2525
include(":app")

0 commit comments

Comments
 (0)