Skip to content

Replace a deprecated kotlinOptions to compilerOptions Extension #410

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
Jaehwa-Noh wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Replace a deprecated kotlinOptions to compilerOptions Extension #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2adeda
Replace a deprecated `kotlinOptions` to `compilerOptions` Extension
Jaehwa-Noh Oct 11, 2025
fb85e05
Reorder copyright.
Jaehwa-Noh Oct 11, 2025
a4be03e
Merge branch 'main' into compiler-options
temcguir Nov 20, 2025
e313ef8
Merge branch 'main' into compiler-options
Jaehwa-Noh Nov 24, 2025
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
11 changes: 7 additions & 4 deletions benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 The Android Open Source Project
* Copyright (C) 2025 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.test)
Expand All @@ -28,8 +29,10 @@ android {
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_1_8)
}
}

defaultConfig {
Expand Down Expand Up @@ -79,4 +82,4 @@ androidComponents {
beforeVariants(selector().all()) {
it.enable = it.buildType == "benchmark"
}
}
}
6 changes: 3 additions & 3 deletions core/camera/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ android {
}
kotlin {
jvmToolchain(17)
}

kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}
}

Expand Down
10 changes: 6 additions & 4 deletions feature/postcapture/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,15 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
jvmToolchain(17)

compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}

buildFeatures {
buildConfig = true
compose = true
Expand All @@ -74,10 +80,6 @@ android {
}
}
}

kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
}
}

dependencies {
Expand Down
6 changes: 6 additions & 0 deletions feature/preview/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,15 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
jvmToolchain(17)

compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}

buildFeatures {
buildConfig = true
compose = true
Expand Down
10 changes: 6 additions & 4 deletions ui/components/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,19 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
jvmToolchain(17)

compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}

buildFeatures {
buildConfig = true
compose = true
}

kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
}
}

dependencies {
Expand Down
10 changes: 6 additions & 4 deletions ui/components/capture/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,19 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
jvmToolchain(17)

compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}

buildFeatures {
buildConfig = true
compose = true
}

kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
}
}

dependencies {
Expand Down
10 changes: 6 additions & 4 deletions ui/uistate/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,19 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
jvmToolchain(17)

compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}

buildFeatures {
buildConfig = true
compose = true
}

kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
}
}

dependencies {
Expand Down
10 changes: 6 additions & 4 deletions ui/uistate/capture/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,19 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
jvmToolchain(17)

compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}

buildFeatures {
buildConfig = true
compose = true
}

kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
}
}

dependencies {
Expand Down
10 changes: 6 additions & 4 deletions ui/uistateadapter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,19 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
jvmToolchain(17)

compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}

buildFeatures {
buildConfig = true
compose = true
}

kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
}
}

dependencies {
Expand Down
10 changes: 6 additions & 4 deletions ui/uistateadapter/capture/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,19 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
jvmToolchain(17)

compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}

buildFeatures {
buildConfig = true
compose = true
}

kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
}
}

dependencies {
Expand Down