Merge pull request #132 from Banno/updates

Update gradle, java, kotlin, agp, target sdk

.editorconfig

@@ -0,0 +1,10 @@
+[*.{kt,kts}]
+ktlint_code_style = intellij_idea
+ktlint_standard_annotation = disabled
+ktlint_standard_class-signature = disabled
+ktlint_standard_comment-spacing = disabled
+ktlint_standard_condition-wrapping = disabled
+ktlint_standard_multiline-if-else = disabled
+ktlint_standard_spacing-between-declarations-with-annotations = disabled
+ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled

.github/workflows/codeql.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - uses: gradle/actions/setup-gradle@v4
 

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
-        java-version: 17
+        java-version: 21
 
     - uses: gradle/actions/setup-gradle@v4
 

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
-        java-version: 17
+        java-version: 21
 
     - uses: gradle/actions/setup-gradle@v4
 

.gitignore

@@ -7,3 +7,4 @@ build
 /captures
 .externalNativeBuild
 .cxx
+.kotlin

build.gradle.kts

@@ -1,3 +1,8 @@
+tasks.wrapper {
+    distributionType = Wrapper.DistributionType.ALL
+    gradleVersion = "latest"
+}
+
 tasks.register<Delete>("clean") {
-    delete(buildDir)
+    delete(layout.buildDirectory)
 }

gordon-plugin/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-html:0.7.3")
 
     implementation("com.android.tools.build:gradle:$androidGradlePluginVersion")
-    implementation("com.android.tools.build:bundletool:1.14.1")
+    implementation("com.android.tools.build:bundletool:1.17.2")
     implementation("com.google.guava:guava:30.1.1-jre")
     implementation("org.smali:dexlib2:2.5.2")
 
@@ -27,9 +27,14 @@ dependencies {
     testImplementation("io.mockk:mockk:1.12.0")
 }
 
+tasks.withType<JavaCompile>().configureEach {
+    sourceCompatibility = "21"
+    targetCompatibility = "21"
+}
+
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 }
 

gordon-plugin/gradle.properties

@@ -1,2 +1,2 @@
 group=com.banno.gordon
-version=1.10.2
+version=1.11.0

gordon-plugin/src/main/kotlin/com/banno/gordon/AndroidPlugin.kt

@@ -29,7 +29,7 @@ internal fun Project.androidPlugin(): AndroidPlugin<*, *>? =
     }
 
 internal sealed class AndroidPlugin<
-    out T : CommonExtension<*, *, *, *>,
+    out T : CommonExtension<*, *, *, *, *, *>,
     out U : AndroidComponentsExtension<out T, *, *>
     > {
 

gordon-plugin/src/main/kotlin/com/banno/gordon/TestResults.kt

@@ -1,6 +1,8 @@
+@file:Suppress("ktlint:standard:no-wildcard-imports")
+
 package com.banno.gordon
 
-import kotlinx.html.* // ktlint-disable no-wildcard-imports
+import kotlinx.html.*
 import kotlinx.html.stream.appendHTML
 
 internal sealed class TestResult {
@@ -27,10 +29,9 @@ internal sealed class TestResult {
 
 data class Failure(val duration: Float?, val shellOutput: String, val deviceSerial: String)
 
-internal inline fun <reified T : TestResult> Map<TestCase, TestResult>.filterResultType(): Map<TestCase, T> {
-    return filterValues { it is T }
+internal inline fun <reified T : TestResult> Map<TestCase, TestResult>.filterResultType(): Map<TestCase, T> =
+    filterValues { it is T }
         .mapValues { it.value as T }
-}
 
 internal fun Map<PoolName, Map<TestCase, TestResult>>.getTestCasesByResult(predicate: (TestResult) -> Boolean): Map<PoolName, List<TestCase>> =
     mapValues {

gradle.properties

@@ -1,10 +1,11 @@
-androidGradlePluginVersion=8.0.0
-aapt2Version=8.0.0-9289358
-kotlinVersion=1.8.10
-kotlinterVersion=3.8.0
-gradlePluginPublishVersion=1.2.0
+androidGradlePluginVersion=8.7.2
+aapt2Version=8.7.2-12006047
+kotlinVersion=1.9.25
+kotlinterVersion=4.4.1
+gradlePluginPublishVersion=1.3.0
 org.gradle.caching=true
 org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx1536m
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip