Migrate to compiler options

skydoves · Jan 3, 2025 · 3a22212 · 3a22212
1 parent 6c6b7ce
commit 3a22212
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 34 deletions.
diff --git a/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/AndroidCompose.kt
@@ -40,10 +40,6 @@ internal fun Project.configureAndroidCompose(
       compose = true
     }
 
-    composeOptions {
-      kotlinCompilerExtensionVersion = "1.5.14"
-    }
-
     packaging {
       resources {
         excludes.add("/META-INF/{AL2.0,LGPL2.1}")

diff --git a/coil3/build.gradle.kts b/coil3/build.gradle.kts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 import com.github.skydoves.landscapist.Configuration
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("landscapist.library.compose.multiplatformWasm")
@@ -115,14 +117,10 @@ baselineProfile {
   }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = "1.8"
-    freeCompilerArgs += listOf(
-      "-Xexplicit-api=strict",
-      "-opt-in=kotlin.RequiresOptIn",
-      "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-      "-opt-in=com.skydoves.landscapist.InternalLandscapistApi",
+tasks.withType<KotlinJvmCompile>().configureEach {
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
+    freeCompilerArgs.addAll(
       "-opt-in=coil3.annotation.ExperimentalCoilApi",
     )
   }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ dokka = "2.0.0"
 jvmTarget = "11"
 nexusPlugin = "0.30.0"
 kotlinxCoroutines = "1.9.0"
-kotlinBinaryCompatibility = "0.16.3"
+kotlinBinaryCompatibility = "0.17.0"
 androidGradlePlugin = "8.7.3"
 androidxActivity = "1.9.3"
 androidxMaterial = "1.12.0"

diff --git a/landscapist-animation/build.gradle.kts b/landscapist-animation/build.gradle.kts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 import com.github.skydoves.landscapist.Configuration
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("landscapist.library.compose.multiplatformWasm")
@@ -86,10 +88,10 @@ baselineProfile {
   }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = "1.8"
-    freeCompilerArgs += listOf(
+tasks.withType<KotlinJvmCompile>().configureEach {
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
+    freeCompilerArgs.addAll(
       "-Xexplicit-api=strict",
       "-opt-in=kotlin.RequiresOptIn",
       "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",

diff --git a/landscapist-palette/build.gradle.kts b/landscapist-palette/build.gradle.kts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 import com.github.skydoves.landscapist.Configuration
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("landscapist.library.compose.multiplatform")
@@ -81,10 +83,10 @@ baselineProfile {
   }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = "1.8"
-    freeCompilerArgs += listOf(
+tasks.withType<KotlinJvmCompile>().configureEach {
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
+    freeCompilerArgs.addAll(
       "-Xexplicit-api=strict",
       "-opt-in=kotlin.RequiresOptIn",
       "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",

diff --git a/landscapist-placeholder/build.gradle.kts b/landscapist-placeholder/build.gradle.kts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 import com.github.skydoves.landscapist.Configuration
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("landscapist.library.compose.multiplatformWasm")
@@ -86,10 +88,10 @@ baselineProfile {
   }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = "1.8"
-    freeCompilerArgs += listOf(
+tasks.withType<KotlinJvmCompile>().configureEach {
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
+    freeCompilerArgs.addAll(
       "-Xexplicit-api=strict",
       "-opt-in=kotlin.RequiresOptIn",
       "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",

diff --git a/landscapist/build.gradle.kts b/landscapist/build.gradle.kts
@@ -15,6 +15,8 @@
  */
 
 import com.github.skydoves.landscapist.Configuration
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("landscapist.library.compose.multiplatformWasm")
@@ -83,14 +85,9 @@ baselineProfile {
   }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = "1.8"
-    freeCompilerArgs += listOf(
-      "-Xexplicit-api=strict",
-      "-opt-in=kotlin.RequiresOptIn",
-      "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-      "-opt-in=com.skydoves.landscapist.InternalLandscapistApi",
-    )
+tasks.withType<KotlinJvmCompile>().configureEach {
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
+
   }
 }