Skip to content

Commit 6d39331

Browse files
committed
Upgrade to Gradle 7.4 and AGP 8.1.0
Test: ./gradlew check :ftlModelBuilder:check publish
1 parent c0b0888 commit 6d39331

File tree

10 files changed

+23
-8
lines changed

10 files changed

+23
-8
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v3
16-
- name: Set up JDK 11
16+
- name: Set up JDK 17
1717
uses: actions/setup-java@v2
1818
with:
19-
java-version: '11'
19+
java-version: '17'
2020
distribution: 'adopt'
2121
- name: "Setup Gradle"
2222
uses: gradle/gradle-build-action@v2

.github/workflows/dist.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
1717
- name: "checkout"
1818
uses: actions/checkout@v3
19-
- name: Set up JDK 11
19+
- name: Set up JDK 17
2020
uses: actions/setup-java@v2
2121
with:
22-
java-version: '11'
22+
java-version: '17'
2323
distribution: 'adopt'
2424
- name: "Setup Gradle"
2525
uses: gradle/gradle-build-action@v2

AndroidXCI/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ val publishRepo = project.layout.buildDirectory.dir("repo")
3434
subprojects {
3535
tasks.withType(KotlinCompile::class.java).configureEach {
3636
kotlinOptions {
37-
jvmTarget = "11"
37+
jvmTarget = "17"
3838
}
3939
}
4040
pluginManager.withPlugin("maven-publish") {

AndroidXCI/cli/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,8 @@ dependencies {
3232
application {
3333
mainClass.set("dev.androidx.ci.cli.MainKt")
3434
}
35+
java {
36+
toolchain {
37+
languageVersion.set(JavaLanguageVersion.of(17))
38+
}
39+
}

AndroidXCI/ftlModelBuilder/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,8 @@ gradlePlugin {
3838
implementationClass = "dev.androidx.ci.codegen.plugin.GenerateModelsPlugin"
3939
}
4040
}
41+
java {
42+
toolchain {
43+
languageVersion.set(JavaLanguageVersion.of(17))
44+
}
45+
}

AndroidXCI/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -XX
1919
org.gradle.configureondemand=true
2020
org.gradle.parallel=true
2121
org.gradle.caching=true
22-
org.gradle.unsafe.configuration-cache=true
22+
org.gradle.configuration-cache=true

AndroidXCI/gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ retrofit = ["retrofit-core", "retrofit-converter-moshi", "okhttp-core", "okhttp-
3232

3333
log4j = ["log4j-kotlin", "log4j-core"]
3434
[plugins]
35+
androidApplication = { id = "com.android.application", version = "8.1.2" }
3536
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
3637
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
3738
ktlintIdea = { id = "org.jlleitschuh.gradle.ktlint-idea", version.ref = "ktlint" }

AndroidXCI/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
distributionBase=GRADLE_USER_HOME
1818
distributionPath=wrapper/dists
19-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
19+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
20+
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
2021
zipStoreBase=GRADLE_USER_HOME
2122
zipStorePath=wrapper/dists

AndroidXCI/lib/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,7 @@ java {
8080
)
8181
}
8282
}
83+
toolchain {
84+
languageVersion.set(JavaLanguageVersion.of(17))
85+
}
8386
}

AndroidXCI/placeholderapp/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
plugins {
18-
id("com.android.application") version("7.3.0")
18+
alias(libs.plugins.androidApplication)
1919
}
2020

2121
android {

0 commit comments

Comments
 (0)