Merge pull request #1395 from square/sedwards/updates

Update to Kotlin 2.1.21 and Compiler Plugins; compileSdk 36; AGP 1.11.1;…

Author: steve-the-edwards

benchmarks/dungeon-benchmark/build.gradle.kts

@@ -2,6 +2,7 @@ import com.rickbusarow.kgx.libsCatalog
 import com.rickbusarow.kgx.version
 import com.squareup.workflow1.buildsrc.internal.javaTarget
 import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("com.android.test")
@@ -19,11 +20,6 @@ android {
     targetCompatibility = javaTargetVersion
   }
 
-  kotlinOptions {
-    jvmTarget = javaTarget
-    freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-  }
-
   defaultConfig {
     minSdk = 28
     targetSdk = libsCatalog.version("targetSdk").toInt()
@@ -44,6 +40,13 @@ android {
   experimentalProperties["android.experimental.self-instrumenting"] = true
 }
 
+kotlin {
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
+    freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
+  }
+}
+
 dependencies {
   implementation(libs.androidx.macro.benchmark)
   implementation(libs.androidx.test.espresso.core)

benchmarks/performance-poetry/complex-benchmark/build.gradle.kts

@@ -2,6 +2,7 @@ import com.rickbusarow.kgx.libsCatalog
 import com.rickbusarow.kgx.version
 import com.squareup.workflow1.buildsrc.internal.javaTarget
 import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("com.android.test")
@@ -19,11 +20,6 @@ android {
     targetCompatibility = javaTargetVersion
   }
 
-  kotlinOptions {
-    jvmTarget = javaTarget
-    freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-  }
-
   defaultConfig {
     minSdk = 28
     targetSdk = libsCatalog.version("targetSdk").toInt()
@@ -53,6 +49,13 @@ android {
   experimentalProperties["android.experimental.self-instrumenting"] = true
 }
 
+kotlin {
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
+    freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
+  }
+}
+
 dependencies {
   implementation(libs.androidx.macro.benchmark)
   implementation(libs.androidx.test.espresso.core)

benchmarks/performance-poetry/complex-poetry/build.gradle.kts

@@ -1,7 +1,7 @@
 import com.rickbusarow.kgx.libsCatalog
 import com.rickbusarow.kgx.version
-import com.squareup.workflow1.buildsrc.internal.javaTarget
 import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("com.android.application")
@@ -16,10 +16,6 @@ android {
     targetCompatibility = javaTargetVersion
   }
 
-  kotlinOptions {
-    jvmTarget = javaTarget
-  }
-
   defaultConfig {
     targetSdk = libsCatalog.version("targetSdk").toInt()
     minSdk = 29
@@ -51,6 +47,12 @@ android {
   namespace = "com.squareup.benchmarks.performance.complex.poetry"
 }
 
+kotlin {
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
+  }
+}
+
 dependencies {
   androidTestImplementation(libs.androidx.test.espresso.core)
   androidTestImplementation(libs.androidx.test.junit)

build-logic/settings.gradle.kts

@@ -1,11 +1,10 @@
 plugins {
   // Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
-  kotlin("jvm") version "2.0.21" apply false
+  kotlin("jvm") version "2.1.21" apply false
 }
 
 dependencyResolutionManagement {
 
-  @Suppress("UnstableApiUsage")
   versionCatalogs {
 
     create("libs") {