Skip to content

Commit 2eccb41

Browse files
chore(deps): update androidgradleplugin to v9 (major) (#1556)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Nicola Corti <corti.nico@gmail.com>
1 parent aec6854 commit 2eccb41

7 files changed

Lines changed: 41 additions & 22 deletions

File tree

.github/workflows/pre-merge.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/setup-java@v5
2929
with:
3030
distribution: 'zulu'
31-
java-version: '17'
31+
java-version: '21'
3232

3333
- name: Setup Gradle
3434
uses: gradle/actions/setup-gradle@v5
@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/setup-java@v5
4848
with:
4949
distribution: 'zulu'
50-
java-version: '17'
50+
java-version: '21'
5151

5252
- name: Setup Gradle
5353
uses: gradle/actions/setup-gradle@v5
@@ -66,7 +66,7 @@ jobs:
6666
uses: actions/setup-java@v5
6767
with:
6868
distribution: 'zulu'
69-
java-version: '17'
69+
java-version: '21'
7070

7171
- name: Setup Gradle
7272
uses: gradle/actions/setup-gradle@v5
@@ -85,7 +85,7 @@ jobs:
8585
uses: actions/setup-java@v5
8686
with:
8787
distribution: 'zulu'
88-
java-version: '17'
88+
java-version: '21'
8989

9090
- name: Setup Gradle
9191
uses: gradle/actions/setup-gradle@v5
@@ -104,7 +104,7 @@ jobs:
104104
uses: actions/setup-java@v5
105105
with:
106106
distribution: 'zulu'
107-
java-version: '17'
107+
java-version: '21'
108108

109109
- name: Setup Gradle
110110
uses: gradle/actions/setup-gradle@v5
@@ -123,7 +123,7 @@ jobs:
123123
uses: actions/setup-java@v5
124124
with:
125125
distribution: 'zulu'
126-
java-version: '17'
126+
java-version: '21'
127127

128128
- name: Setup Gradle
129129
uses: gradle/actions/setup-gradle@v5

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
alias(libs.plugins.kotlinx.binary.compatibility.validator)
33
alias(libs.plugins.nexus.publish)
4-
alias(libs.plugins.android.application) apply false
54
alias(libs.plugins.kotlin.android) apply false
5+
alias(libs.plugins.android.application) apply false
66
alias(libs.plugins.android.library) apply false
77
alias(libs.plugins.android.junit5) apply false
88
alias(libs.plugins.detekt) apply false

gradle.properties

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ org.gradle.jvmargs=-Xmx1536m
1717
org.gradle.parallel=true
1818

1919
android.useAndroidX=true
20+
# Opt out of AGP 9 built-in Kotlin support and new DSL.
21+
# Required because binary-compatibility-validator (0.18.1) is incompatible
22+
# with built-in Kotlin (https://youtrack.jetbrains.com/issue/KT-83410).
23+
# The kotlin.android plugin also requires the old DSL (android.newDsl=false).
24+
# Remove once BCV supports AGP 9 built-in Kotlin or migrate to Kotlin's
25+
# built-in abiValidation (available since Kotlin 2.2.0).
26+
android.builtInKotlin=false
27+
android.newDsl=false
2028

2129
VERSION_NAME=4.4.0-SNAPSHOT
2230
# 4*100*100 + 4*100 + 0 => 40400

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
androidGradlePlugin = "8.13.2"
2+
androidGradlePlugin = "9.0.1"
33
converterGson = "3.0.0"
44
core = "1.7.0"
55
coreTesting = "2.2.0"
@@ -27,7 +27,7 @@ paletteKtx = "1.0.0"
2727
gson = "2.13.2"
2828
okhttp = "5.3.2"
2929
retrofit = "3.0.0"
30-
wire = "5.5.0"
30+
wire = "6.0.0-alpha02"
3131
cronetOkhttp = "0.1.0"
3232
playServicesCronet = "18.1.0"
3333

library-no-op/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ android {
1111
namespace = "com.chuckerteam.chucker"
1212

1313
compileOptions {
14-
sourceCompatibility = JavaVersion.VERSION_17
15-
targetCompatibility = JavaVersion.VERSION_17
14+
sourceCompatibility = JavaVersion.VERSION_21
15+
targetCompatibility = JavaVersion.VERSION_21
1616
}
1717

1818
kotlin {
19-
jvmToolchain(17)
19+
jvmToolchain(21)
2020
}
2121

2222
buildFeatures {

library/build.gradle.kts

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,32 @@ android {
1313
defaultConfig {
1414
minSdk = rootProject.extra["minSdkVersion"] as Int
1515
consumerProguardFiles("proguard-rules.pro")
16-
resValue("string", "chucker_version", rootProject.extra["VERSION_NAME"] as String)
16+
1717
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1818
}
1919

2020
compileOptions {
21-
sourceCompatibility = JavaVersion.VERSION_17
22-
targetCompatibility = JavaVersion.VERSION_17
21+
sourceCompatibility = JavaVersion.VERSION_21
22+
targetCompatibility = JavaVersion.VERSION_21
2323
}
2424

2525
kotlin {
26-
jvmToolchain(17)
26+
jvmToolchain(21)
2727
}
2828

2929
buildFeatures {
3030
viewBinding = true
3131
buildConfig = false
32+
resValues = true
33+
}
34+
35+
buildTypes {
36+
release {
37+
resValue("string", "chucker_version", rootProject.extra["VERSION_NAME"] as String)
38+
}
39+
debug {
40+
resValue("string", "chucker_version", rootProject.extra["VERSION_NAME"] as String)
41+
}
3242
}
3343

3444
testOptions {

sample/build.gradle.kts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ android {
3232
buildTypes {
3333
getByName("debug") {
3434
isMinifyEnabled = false
35-
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
35+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
3636
signingConfig = signingConfigs.getByName("debug")
3737
}
3838
getByName("release") {
3939
isMinifyEnabled = false
40-
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
40+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
4141
signingConfig = signingConfigs.getByName("debug")
4242
}
4343
}
@@ -52,12 +52,12 @@ android {
5252
}
5353

5454
compileOptions {
55-
sourceCompatibility = JavaVersion.VERSION_17
56-
targetCompatibility = JavaVersion.VERSION_17
55+
sourceCompatibility = JavaVersion.VERSION_21
56+
targetCompatibility = JavaVersion.VERSION_21
5757
}
5858

5959
kotlin {
60-
jvmToolchain(17)
60+
jvmToolchain(21)
6161
}
6262

6363
lint {
@@ -71,8 +71,9 @@ apollo {
7171
service("rickandmortyapi") {
7272
packageName.set("com.chuckerteam.chucker.sample")
7373
schemaFile.set(file("src/main/graphql/com/chuckerteam/chucker/sample/schema.json.graphql"))
74-
srcDir("src/main/graphql")
74+
srcDir(file("src/main/graphql"))
7575
excludes.set(listOf("**/schema.json.graphql", "**/schema.json"))
76+
generateKotlinModels.set(true)
7677
}
7778
}
7879

0 commit comments

Comments
 (0)