From 09fc3cccbf1769fdd2f44a2979176a96eff0b16a Mon Sep 17 00:00:00 2001 From: Jan Seeger Date: Fri, 6 Dec 2024 16:13:48 +0100 Subject: [PATCH] Clean up Gradle build --- .../src/main/kotlin/AndroidLibraryBasePlugin.kt | 10 ++++++---- build.gradle.kts | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-logic/android-library/src/main/kotlin/AndroidLibraryBasePlugin.kt b/build-logic/android-library/src/main/kotlin/AndroidLibraryBasePlugin.kt index ee0c887..cdc131f 100644 --- a/build-logic/android-library/src/main/kotlin/AndroidLibraryBasePlugin.kt +++ b/build-logic/android-library/src/main/kotlin/AndroidLibraryBasePlugin.kt @@ -5,9 +5,10 @@ import org.gradle.api.Project import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.withType import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -class AndroidLibraryBasePlugin: Plugin { +class AndroidLibraryBasePlugin : Plugin { override fun apply(target: Project) { with(target) { with(pluginManager) { @@ -43,10 +44,11 @@ private fun Project.setJdkVersion(version: JavaVersion) { private fun Project.enableContextReceivers() { tasks.withType().configureEach { - kotlinOptions { - languageVersion = "2.0" - freeCompilerArgs = freeCompilerArgs + listOf( + compilerOptions { + languageVersion.set(KotlinVersion.KOTLIN_2_1) + freeCompilerArgs.addAll(listOf( "-Xcontext-receivers" + ) ) } } diff --git a/build.gradle.kts b/build.gradle.kts index c4b9981..c737f89 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,3 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { alias(libs.plugins.android.library) apply false alias(libs.plugins.kotlin.android) apply false