Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions benchmarks/dungeon-benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -19,11 +20,6 @@ android {
targetCompatibility = javaTargetVersion
}

kotlinOptions {
jvmTarget = javaTarget
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
}

defaultConfig {
minSdk = 28
targetSdk = libsCatalog.version("targetSdk").toInt()
Expand All @@ -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)
Expand Down
13 changes: 8 additions & 5 deletions benchmarks/performance-poetry/complex-benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -19,11 +20,6 @@ android {
targetCompatibility = javaTargetVersion
}

kotlinOptions {
jvmTarget = javaTarget
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
}

defaultConfig {
minSdk = 28
targetSdk = libsCatalog.version("targetSdk").toInt()
Expand Down Expand Up @@ -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)
Expand Down
12 changes: 7 additions & 5 deletions benchmarks/performance-poetry/complex-poetry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -16,10 +16,6 @@ android {
targetCompatibility = javaTargetVersion
}

kotlinOptions {
jvmTarget = javaTarget
}

defaultConfig {
targetSdk = libsCatalog.version("targetSdk").toInt()
minSdk = 29
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions build-logic/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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") {
Expand Down
Loading
Loading