Merge pull request #72 from androidx/upgradle

Upgrade to Gradle 7.4 and AGP 8.1.0
androidx · Oct 19, 2023 · 336fedc · 336fedc
2 parents c0b0888 + 6d39331
commit 336fedc
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: "Setup Gradle"
         uses: gradle/gradle-build-action@v2

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
@@ -16,10 +16,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: "checkout"
         uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: "Setup Gradle"
         uses: gradle/gradle-build-action@v2

diff --git a/AndroidXCI/build.gradle.kts b/AndroidXCI/build.gradle.kts
@@ -34,7 +34,7 @@ val publishRepo = project.layout.buildDirectory.dir("repo")
 subprojects {
     tasks.withType(KotlinCompile::class.java).configureEach {
         kotlinOptions {
-            jvmTarget = "11"
+            jvmTarget = "17"
         }
     }
     pluginManager.withPlugin("maven-publish") {

diff --git a/AndroidXCI/cli/build.gradle.kts b/AndroidXCI/cli/build.gradle.kts
@@ -32,3 +32,8 @@ dependencies {
 application {
     mainClass.set("dev.androidx.ci.cli.MainKt")
 }
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
diff --git a/AndroidXCI/ftlModelBuilder/build.gradle.kts b/AndroidXCI/ftlModelBuilder/build.gradle.kts
@@ -38,3 +38,8 @@ gradlePlugin {
         implementationClass = "dev.androidx.ci.codegen.plugin.GenerateModelsPlugin"
     }
 }
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
diff --git a/AndroidXCI/gradle.properties b/AndroidXCI/gradle.properties
@@ -19,4 +19,4 @@ org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -XX
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.unsafe.configuration-cache=true
+org.gradle.configuration-cache=true
diff --git a/AndroidXCI/gradle/libs.versions.toml b/AndroidXCI/gradle/libs.versions.toml
@@ -32,6 +32,7 @@ retrofit = ["retrofit-core", "retrofit-converter-moshi", "okhttp-core", "okhttp-
 
 log4j = ["log4j-kotlin", "log4j-core"]
 [plugins]
+androidApplication = { id = "com.android.application", version = "8.1.2" }
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 ktlintIdea = { id = "org.jlleitschuh.gradle.ktlint-idea", version.ref = "ktlint" }

diff --git a/AndroidXCI/gradle/wrapper/gradle-wrapper.properties b/AndroidXCI/gradle/wrapper/gradle-wrapper.properties
@@ -16,6 +16,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/AndroidXCI/lib/build.gradle.kts b/AndroidXCI/lib/build.gradle.kts
@@ -80,4 +80,7 @@ java {
             )
         }
     }
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
 }
diff --git a/AndroidXCI/placeholderapp/build.gradle.kts b/AndroidXCI/placeholderapp/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-    id("com.android.application") version("7.3.0")
+    alias(libs.plugins.androidApplication)
 }
 
 android {