chore: revert to Kotlin 2.2.21 with language level 2.2.

Author: autonomousapps

CHANGELOG.md

@@ -1,5 +1,8 @@
 Dependency Analysis Plugin Changelog
 
+# Version 3.8.0
+* (Reverted) Compiled against Kotlin 2.3.20. Compiling against Kotlin 2.2.21 again, with language level 2.2.
+
 # Version 3.8.0
 * [feat]: record lambda in binaryClassAccesses.
 * [feat]: support analysis of a Gradle version catalog dependency.

build-logic/convention/src/main/kotlin/com/autonomousapps/convention/BaseConventionPlugin.kt

@@ -13,7 +13,7 @@ import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.plugins.signing.Sign
-import org.jetbrains.dokka.gradle.DokkaTask
+import org.jetbrains.dokka.gradle.tasks.DokkaGeneratePublicationTask
 
 @Suppress("unused")
 internal class BaseConventionPlugin(private val project: Project) {
@@ -80,33 +80,43 @@ internal class BaseConventionPlugin(private val project: Project) {
       .map { it.toBoolean() }
 
     val taskGraph = gradle.taskGraph
-    val isFunctionalTest: Provider<Boolean> = providers
-      .provider { taskGraph.hasTask(":functionalTest") }
+    val isFunctionalTest: Provider<Boolean> = providers.provider { taskGraph.hasTask(":functionalTest") }
 
     tasks.withType(Sign::class.java).configureEach { t ->
       with(t) {
         inputs.property("version", publishedVersion)
+        inputs.property("is-snapshot", isSnapshot)
         inputs.property("is-ci", isCi)
         inputs.property("is-functional-test", isFunctionalTest)
 
         // Don't sign snapshots
-        onlyIf("Not a snapshot") { !isSnapshot.get() }
+        onlyIf("Not a snapshot") {
+          !(inputs.properties["is-snapshot"] as Boolean)
+        }
         // We currently don't support publishing from CI
-        onlyIf("release environment") { !isCi.get() }
+        onlyIf("release environment") {
+          !(inputs.properties["is-ci"] as Boolean)
+        }
         // Don't sign when running functional tests
-        onlyIf("not running functional tests") { !isFunctionalTest.get() }
+        onlyIf("not running functional tests") {
+          !(inputs.properties["is-functional-test"] as Boolean)
+        }
 
         doFirst {
-          logger.quiet("Signing v${publishedVersion.get()}")
+          val version = inputs.properties["version"] as String
+          logger.quiet("Signing v$version")
         }
       }
     }
 
-    tasks.withType(DokkaTask::class.java).configureEach { t ->
-      t.inputs.property("is-functional-test", isFunctionalTest)
+    tasks.withType(DokkaGeneratePublicationTask::class.java).configureEach { t ->
+      val key = "is-functional-test"
+      t.inputs.property(key, isFunctionalTest)
 
       // Don't sign when running functional tests
-      t.onlyIf("not running functional tests") { !isFunctionalTest.get() }
+      t.onlyIf("not running functional tests") {
+        !(t.inputs.properties[key] as Boolean)
+      }
     }
 
     configureMetalava()

build-logic/convention/src/main/kotlin/com/autonomousapps/convention/internal/kotlin/KotlinConfigurer.kt

@@ -14,16 +14,17 @@ internal class KotlinConfigurer(private val project: Project) {
   private val versionCatalog = project.extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
   private val javaTarget = versionCatalog.findVersion("javaTarget").orElseThrow().requiredVersion
   private val kotlin = versionCatalog.findVersion("kotlin").get().requiredVersion
-
-  // this function expects strings of the form 2.x, not 2.x.y
-  private val kotlinVersion = KotlinVersion.fromVersion(kotlin.substringBeforeLast('.'))
+  private val kotlinLanguageVersion = versionCatalog.findVersion("kotlinLanguageVersion").get().requiredVersion
+    .toKotlinVersion()
 
   fun configure(): Unit = project.run {
     configureKotlinExtension()
     configureKotlinTarget()
     configureKotlinVersion()
   }
 
+  private fun String.toKotlinVersion(): KotlinVersion = KotlinVersion.fromVersion(this)
+
   private fun Project.configureKotlinExtension() {
     project.extensions.getByType(KotlinJvmProjectExtension::class.java).run {
       explicitApi()
@@ -34,9 +35,10 @@ internal class KotlinConfigurer(private val project: Project) {
   private fun Project.configureKotlinTarget() {
     tasks.withType(KotlinCompile::class.java).configureEach { t ->
       t.compilerOptions {
-        // Ensure compatibility with Gradle 8.x. See https://docs.gradle.org/9.0.0/userguide/compatibility.html.
-        apiVersion.set(kotlinVersion)
-        languageVersion.set(kotlinVersion)
+        // Ensure compatibility with various versions of Gradle.
+        // See https://docs.gradle.org/9.4.1/userguide/compatibility.html.
+        apiVersion.set(kotlinLanguageVersion)
+        languageVersion.set(kotlinLanguageVersion)
         jvmTarget.set(JvmTarget.fromTarget(javaTarget))
         freeCompilerArgs.add(
           // equivalent to JavaCompile's `options.release`
@@ -46,9 +48,7 @@ internal class KotlinConfigurer(private val project: Project) {
     }
   }
 
-  /**
-   * @see <a href="https://github.com/autonomousapps/dependency-analysis-gradle-plugin/issues/1537#issuecomment-3293306966">Issue 1537</a>
-   */
+  /** @see <a href="https://github.com/autonomousapps/dependency-analysis-gradle-plugin/issues/1537#issuecomment-3293306966">Issue 1537</a> */
   private fun Project.configureKotlinVersion() {
     configurations.configureEach { c ->
       if (c.isCanBeResolved) {

gradle/libs.versions.toml

@@ -23,9 +23,12 @@ jdkVersion = "17"
 jspecify = "1.0.0"
 junit = "5.14.1"
 # IMPORTANT: keep this version in sync with build-logic/build.gradle.kts
-kotlin = "2.3.20"
-kotlinForAndroidtests = "2.3.20"
-kotlinMetadata = "2.3.20"
+# See https://docs.gradle.org/9.4.1/userguide/compatibility.html.
+# Gradle 9.x uses Kotlin language version 2.2
+kotlinLanguageVersion = "2.2"
+kotlin = "2.2.21"
+kotlinForAndroidtests = "2.2.21"
+kotlinMetadata = "2.2.21"
 kotlinDokka = "2.2.0"
 # Cannot be called kotlin-editor as it causes `libs.versions.kotlin.get()` to fail
 kotlineditor-core = "0.20"

src/functionalTest/groovy/com/autonomousapps/android/projects/DuplicateDependencyVersionsProject.groovy

@@ -124,10 +124,10 @@ final class DuplicateDependencyVersionsProject extends AbstractAndroidProject {
     junit-junit-4-12 = { module = "junit:junit", version = "4.12" }
     junit-junit-4-13 = { module = "junit:junit", version = "4.13" }
     org-hamcrest-hamcrest-core-1-3 = { module = "org.hamcrest:hamcrest-core", version = "1.3" }
-    org-jetbrains-kotlin-kotlin-stdlib-common-2-3-20 = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version = "2.3.20" }
+    org-jetbrains-kotlin-kotlin-stdlib-common-2-2-21 = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version = "2.2.21" }
     org-jetbrains-kotlin-kotlin-stdlib-jdk7-1-8-0 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version = "1.8.0" }
     org-jetbrains-kotlin-kotlin-stdlib-jdk8-1-8-0 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version = "1.8.0" }
-    org-jetbrains-kotlin-kotlin-stdlib-2-3-20 = { module = "org.jetbrains.kotlin:kotlin-stdlib", version = "2.3.20" }
+    org-jetbrains-kotlin-kotlin-stdlib-2-2-21 = { module = "org.jetbrains.kotlin:kotlin-stdlib", version = "2.2.21" }
     org-jetbrains-kotlinx-kotlinx-coroutines-android-1-6-4 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.6.4" }
     org-jetbrains-kotlinx-kotlinx-coroutines-core-jvm-1-6-4 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version = "1.6.4" }
     org-jetbrains-kotlinx-kotlinx-coroutines-core-1-6-4 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" }