Upgrade to AGP 8.1.2

caliper-gradle-plugin/build.gradle.kts

@@ -1,7 +1,5 @@
 plugins {
-//    `kotlin-dsl` // For 1.8.10
-    id("org.gradle.kotlin.kotlin-dsl") version "3.2.7" // For 1.7.22
-
+    `kotlin-dsl`
     alias(deps.plugins.kotlin.serialization)
     id("java-gradle-plugin")
     alias(deps.plugins.build.config)

caliper-gradle-plugin/src/main/kotlin/me/xx2bab/caliper/gradle/CaliperPlugin.kt

@@ -12,7 +12,7 @@ import me.xx2bab.caliper.gradle.build.BuildConfig
 import me.xx2bab.caliper.gradle.core.GradleKLogger
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.attributes.*
+import org.gradle.api.attributes.Attribute
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.kotlin.dsl.getByType
@@ -113,20 +113,6 @@ abstract class CaliperPlugin : Plugin<Project> {
                     }
                 appVariant.instrumentation
                     .setAsmFramesComputationMode(FramesComputationMode.COPY_FRAMES)
-
-//                val modifyClassesTaskProvider =
-//                    project.tasks.register<ModifyClassesTask>("${appVariant.name}ModifyClasses") {
-//                        objectFactory = project.objects
-//                    }
-//                appVariant.artifacts
-//                    .forScope(ScopedArtifacts.Scope.ALL)
-//                    .use(modifyClassesTaskProvider)
-//                    .toTransform(
-//                        ScopedArtifact.CLASSES,
-//                        ModifyClassesTask::allJars,
-//                        ModifyClassesTask::allDirectories,
-//                        ModifyClassesTask::output
-//                    )
             }
         }
 

code-analyzer/src/main/kotlin/com/bennyhuo/kotlin/analyzer/Options.kt

@@ -2,10 +2,7 @@ package com.bennyhuo.kotlin.analyzer
 
 import io.github.detekt.tooling.api.spec.ProcessingSpec
 import io.github.detekt.tooling.dsl.ProcessingSpecBuilder
-import org.jetbrains.kotlin.js.inline.util.replaceThisReference
 import java.io.File
-import java.io.PrintStream
-import java.lang.StringBuilder
 
 /**
  * Created by benny.

code-analyzer/src/main/kotlin/com/bennyhuo/kotlin/analyzer/core/withSettings.kt

@@ -2,7 +2,6 @@
 
 package com.bennyhuo.kotlin.analyzer.core
 
-import io.github.detekt.tooling.api.spec.ConfigSpec
 import io.github.detekt.tooling.api.spec.ProcessingSpec
 import io.github.detekt.utils.openSafeStream
 import io.gitlab.arturbosch.detekt.api.Config
@@ -14,10 +13,7 @@ import io.gitlab.arturbosch.detekt.core.config.YamlConfig
 import io.gitlab.arturbosch.detekt.core.reporting.DETEKT_OUTPUT_REPORT_BASE_PATH_KEY
 import io.gitlab.arturbosch.detekt.core.reporting.DETEKT_OUTPUT_REPORT_PATHS_KEY
 import io.gitlab.arturbosch.detekt.core.tooling.getDefaultConfiguration
-import java.net.URI
 import java.net.URL
-import java.nio.file.FileSystemNotFoundException
-import java.nio.file.FileSystems
 import java.nio.file.Path
 
 internal fun ProcessingSpec.toSettings(): ProcessingSettings {

deps.versions.toml

@@ -1,17 +1,17 @@
 [versions]
-kotlinVer = "1.7.22"
-agpVer = "8.0.0-rc01"
+kotlinVer = "1.9.22"
+agpVer = "8.1.2"
 asmVer = "9.4"
-kotlinpoetVer = "1.12.0"
-kspVer = "1.7.22-1.0.8" #"1.8.10-1.0.9"
+kotlinpoetVer = "1.15.3"
+kspVer = "1.9.22-1.0.16" #"1.8.10-1.0.9"
 
 [libraries]
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agpVer" }
 android-gradle-pluginapi = { module = "com.android.tools.build:gradle-api", version.ref = "agpVer" }
 kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVer" }
 kotlin-std = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlinVer" }
-kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.4.1" }
-apache-common-text = { module = "org.apache.commons:commons-text", version = "1.10.0" }
+kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.6.2" }
+apache-common-text = { module = "org.apache.commons:commons-text", version = "1.11.0" }
 javapoet = { module = "com.squareup:javapoet", version = "1.13.0" }
 kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoetVer" }
 kotlinpoet-interop-javapoet = { module = "com.squareup:kotlinpoet-javapoet", version.ref = "kotlinpoetVer" }
@@ -26,13 +26,13 @@ junit4 = { module = "junit:junit", version = "4.13.2" }
 junit5 = { module = "org.junit.jupiter:junit-jupiter", version = "5.9.2" }
 robolectric = { module = "org.robolectric:robolectric", version = "4.9.2" }
 hamcrest = { module = "org.hamcrest:hamcrest-library", version = "2.2" }
-mockk = { module = "io.mockk:mockk", version = "1.13.2" }
-kotlin-compile-testing = { module = "com.github.tschuchortdev:kotlin-compile-testing", version = "1.4.9" }
-kotlin-compile-testing-ksp = { module = "com.github.tschuchortdev:kotlin-compile-testing-ksp", version = "1.4.9" }
+mockk = { module = "io.mockk:mockk", version = "1.13.8" }
+kotlin-compile-testing = { module = "com.github.tschuchortdev:kotlin-compile-testing", version = "1.5.0" }
+kotlin-compile-testing-ksp = { module = "com.github.tschuchortdev:kotlin-compile-testing-ksp", version = "1.5.0" }
 
 
 [bundles]
 
 [plugins]
-build-config = { id = "com.github.gmazzo.buildconfig", version = "3.1.0" }
+build-config = { id = "com.github.gmazzo.buildconfig", version = "5.2.0" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinVer" }

gradle/wrapper/gradle-wrapper.properties

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