Skip to content

Migrate from kotlinOptions to kotlin.compilerOptions #680

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

Open
runningcode wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate from kotlinOptions to kotlin.compilerOptions #680

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
8 changes: 4 additions & 4 deletions benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.benchmark)
Expand All @@ -12,10 +14,6 @@ android {
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
}

defaultConfig {
minSdk = 26
// TODO(chromy): Should not be needed.
Expand All @@ -40,6 +38,8 @@ android {
}
}

kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_1_8

dependencies {
androidTestImplementation(libs.androidx.test.runner)
androidTestImplementation(libs.androidx.junit)
Expand Down
12 changes: 7 additions & 5 deletions distribution/distribution/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated

plugins {
Expand Down Expand Up @@ -48,11 +50,6 @@ android {
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
languageVersion = "1.9"
}

defaultConfig {
version = project.version
minSdk = 21
Expand All @@ -65,6 +62,11 @@ android {
}
}

kotlin.compilerOptions {
jvmTarget = JvmTarget.JVM_11
languageVersion = KotlinVersion.KOTLIN_1_9
}

dependencies {
implementation(libs.kotlinx.serialization)
implementation(libs.okhttp)
Expand Down
8 changes: 4 additions & 4 deletions distribution/integration/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.compose.compiler)
Expand Down Expand Up @@ -43,15 +45,13 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildFeatures {
compose = true
}
}

kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17

buildConfig {
className("DistributionConfig")
packageName("com.emergetools.distribution.sample")
Expand Down
8 changes: 4 additions & 4 deletions distribution/sample/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.compose.compiler)
Expand Down Expand Up @@ -43,15 +45,13 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildFeatures {
compose = true
}
}

kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17

buildConfig {
className("DistributionConfig")
packageName("com.emergetools.distribution.sample")
Expand Down
1 change: 0 additions & 1 deletion gradle-plugin/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ dependencyResolutionManagement {
mavenCentral()
}

// TODO(chromy): Is this correct?
versionCatalogs {
create("libs") {
from(files("../gradle/libs.versions.toml"))
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ androidxactivity = "1.10.1"
# https://android-review.googlesource.com/c/platform/frameworks/support/+/2692852/37/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/internal/ComposableLambda.kt#625
compose-bom = "2024.08.00"
detekt = "1.23.8"
kotlin = "2.2.0"
kotlin = "2.3.0"
kotlin-coroutines = "1.10.2"
okhttp = "4.12.0"
junit-jupiter = "5.13.4"
Expand Down
6 changes: 3 additions & 3 deletions performance/performance/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
Expand Down Expand Up @@ -37,13 +38,12 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}

sourceSets.getByName("main").resources.srcDir(metaInfResDir)
}

kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_11
Copy link
Contributor Author

@runningcode runningcode Jan 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a functional change, I bumped it to 11 from 8. 8 is deprecated anyways.


dependencies {
implementation(libs.junit4)

Expand Down
8 changes: 4 additions & 4 deletions performance/sample/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.compose.compiler)
Expand Down Expand Up @@ -72,15 +74,13 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildFeatures {
compose = true
}
}

kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17

dependencies {
implementation(libs.androidx.activity)
implementation(libs.androidx.activity.compose)
Expand Down
12 changes: 7 additions & 5 deletions reaper/reaper/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion

plugins {
alias(libs.plugins.android.library)
Expand All @@ -23,11 +25,6 @@ android {
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
languageVersion = "1.9"
}

defaultConfig {
minSdk = 21
}
Expand All @@ -36,6 +33,11 @@ android {
sourceSets.getByName("main").resources.srcDir(metaInfResDir)
}

kotlin.compilerOptions {
jvmTarget = JvmTarget.JVM_11
languageVersion = KotlinVersion.KOTLIN_1_9
}

dependencies {
implementation(libs.kotlinx.serialization)
implementation(libs.okhttp)
Expand Down
8 changes: 4 additions & 4 deletions reaper/sample/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.compose.compiler)
Expand Down Expand Up @@ -45,15 +47,13 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildFeatures {
compose = true
}
}

kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17

dependencies {
implementation(libs.androidx.activity)
implementation(libs.androidx.activity.compose)
Expand Down
8 changes: 4 additions & 4 deletions reaper/sample/manuallyInitializedApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.compose.compiler)
Expand Down Expand Up @@ -43,15 +45,13 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildFeatures {
compose = true
}
}

kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17

dependencies {
implementation(libs.androidx.activity)
implementation(libs.androidx.activity.compose)
Expand Down
8 changes: 4 additions & 4 deletions reaper/sample/stress/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.compose.compiler)
Expand Down Expand Up @@ -57,15 +59,13 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildFeatures {
compose = true
}
}

kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17

buildConfig {
className("ReaperConfig")
packageName("com.emergetools.reaper.sample.stress")
Expand Down
8 changes: 4 additions & 4 deletions snapshots/sample/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.compose.compiler)
Expand Down Expand Up @@ -43,15 +45,13 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildFeatures {
compose = true
}
}

kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17

dependencies {
implementation(libs.androidx.activity)
implementation(libs.androidx.activity.compose)
Expand Down
8 changes: 4 additions & 4 deletions snapshots/sample/ui-module/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.compose.compiler)
Expand All @@ -17,15 +19,13 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildFeatures {
compose = true
}
}

kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17

dependencies {
implementation(libs.androidx.activity.compose)

Expand Down
8 changes: 4 additions & 4 deletions snapshots/snapshots-universal-invoker/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.compose.compiler)
Expand Down Expand Up @@ -31,15 +33,13 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildFeatures {
compose = true
}
}

kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_17

dependencies {

implementation(platform(libs.compose.bom))
Expand Down
13 changes: 8 additions & 5 deletions snapshots/snapshots/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion

plugins {
Expand All @@ -23,11 +24,6 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
languageVersion = KotlinVersion.KOTLIN_1_9.version
}

defaultConfig {
minSdk = 23
}
Expand All @@ -41,6 +37,13 @@ android {
sourceSets.getByName("main").resources.srcDir(metaInfResDir)
}

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_17
languageVersion = KotlinVersion.KOTLIN_1_9
}
}

dependencies {

implementation(libs.junit4)
Expand Down
Loading