Clean up Gradle build

sipgate · Dec 6, 2024 · 09fc3cc · 09fc3cc
1 parent 1bdd3f9
commit 09fc3cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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<Project> {
+class AndroidLibraryBasePlugin : Plugin<Project> {
     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<KotlinCompile>().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
@@ -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