Merge pull request #724 from skydoves/kotlin/2.2.0

Bump Kotlin to 2.2.0 and jvm target to 17

Author: skydoves

app/build.gradle.kts

@@ -16,7 +16,6 @@
 
 import com.github.skydoves.landscapist.Configuration
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
   id("landscapist.application.compose")
   id("landscapist.spotless")

build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt

@@ -17,14 +17,14 @@
 import com.android.build.gradle.LibraryExtension
 import com.skydoves.landscapist.configureAndroidCompose
 import com.skydoves.landscapist.configureKotlinAndroid
-import com.skydoves.landscapist.kotlinOptions
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.withType
 
 class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
   override fun apply(target: Project) {
@@ -40,8 +40,10 @@ class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
         configureKotlinAndroid(this)
         configureAndroidCompose(this)
 
-        kotlinOptions {
-          freeCompilerArgs = freeCompilerArgs + listOf("-Xexplicit-api=strict")
+        tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+          compilerOptions {
+            freeCompilerArgs.addAll(listOf("-Xexplicit-api=strict"))
+          }
         }
       }
 

build-logic/convention/src/main/kotlin/ComposeMultiplatformLibraryConventionPlugin.kt

@@ -15,10 +15,7 @@
  */
 
 import com.android.build.gradle.LibraryExtension
-import com.skydoves.landscapist.configureAndroidCompose
 import com.skydoves.landscapist.configureComposeMultiplatform
-import com.skydoves.landscapist.configureKotlinAndroid
-import com.skydoves.landscapist.kotlinOptions
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension

build-logic/convention/src/main/kotlin/com/skydoves/landscapist/KotlinAndroid.kt

@@ -22,11 +22,11 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
-import org.gradle.api.plugins.ExtensionAware
-import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+import org.gradle.kotlin.dsl.named
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 /**
  * Configure base Kotlin with Android options
@@ -39,25 +39,25 @@ internal fun Project.configureKotlinAndroid(
   commonExtension.apply {
 
     compileOptions {
-      sourceCompatibility = JavaVersion.VERSION_11
-      targetCompatibility = JavaVersion.VERSION_11
+      sourceCompatibility = JavaVersion.VERSION_17
+      targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-      jvmTarget = libs.findVersion("jvmTarget").get().toString()
-      freeCompilerArgs = freeCompilerArgs + listOf(
-        "-opt-in=kotlin.RequiresOptIn",
-        "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-        "-opt-in=com.skydoves.landscapist.InternalLandscapistApi",
-      )
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+      compilerOptions {
+        jvmTarget.set(JvmTarget.fromTarget(libs.findVersion("jvmTarget").get().toString()))
+        freeCompilerArgs.addAll(
+          listOf(
+            "-opt-in=kotlin.RequiresOptIn",
+            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-opt-in=com.skydoves.landscapist.InternalLandscapistApi",
+          )
+        )
+      }
     }
 
     lint {
       abortOnError = false
     }
   }
-}
-
-fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
-  (this as ExtensionAware).extensions.configure("kotlinOptions", block)
-}
+}

coil3/build.gradle.kts

@@ -124,7 +124,7 @@ baselineProfile {
 
 tasks.withType<KotlinJvmCompile>().configureEach {
   compilerOptions {
-    jvmTarget.set(JvmTarget.JVM_11)
+    jvmTarget.set(JvmTarget.JVM_17)
     freeCompilerArgs.addAll(
       "-opt-in=coil3.annotation.ExperimentalCoilApi",
     )

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 dokka = "2.0.0"
-jvmTarget = "11"
-nexusPlugin = "0.32.0"
+jvmTarget = "17"
+nexusPlugin = "0.34.0"
 kotlinxCoroutines = "1.10.2"
-kotlinBinaryCompatibility = "0.17.0"
+kotlinBinaryCompatibility = "0.18.1"
 androidGradlePlugin = "8.12.0"
 androidxActivity = "1.10.1"
 androidxMaterial = "1.12.0"
@@ -17,7 +17,7 @@ androidxJunit = "1.3.0"
 androidxMacroBenchmark = "1.4.0"
 androidxProfileinstaller = "1.4.1"
 androidxUiAutomator = "2.3.0"
-kotlinxSerializationJson = "1.8.1"
+kotlinxSerializationJson = "1.9.0"
 jetbrains-compose = "1.8.2"
 glide = "4.16.0"
 fresco = "3.6.0"

landscapist-animation/build.gradle.kts

@@ -90,7 +90,7 @@ baselineProfile {
 
 tasks.withType<KotlinJvmCompile>().configureEach {
   compilerOptions {
-    jvmTarget.set(JvmTarget.JVM_11)
+    jvmTarget.set(JvmTarget.JVM_17)
     freeCompilerArgs.addAll(
       "-Xexplicit-api=strict",
       "-opt-in=kotlin.RequiresOptIn",

landscapist-palette/build.gradle.kts

@@ -85,7 +85,7 @@ baselineProfile {
 
 tasks.withType<KotlinJvmCompile>().configureEach {
   compilerOptions {
-    jvmTarget.set(JvmTarget.JVM_11)
+    jvmTarget.set(JvmTarget.JVM_17)
     freeCompilerArgs.addAll(
       "-Xexplicit-api=strict",
       "-opt-in=kotlin.RequiresOptIn",

landscapist-placeholder/build.gradle.kts

@@ -90,7 +90,7 @@ baselineProfile {
 
 tasks.withType<KotlinJvmCompile>().configureEach {
   compilerOptions {
-    jvmTarget.set(JvmTarget.JVM_11)
+    jvmTarget.set(JvmTarget.JVM_17)
     freeCompilerArgs.addAll(
       "-Xexplicit-api=strict",
       "-opt-in=kotlin.RequiresOptIn",

landscapist/build.gradle.kts

@@ -87,7 +87,7 @@ baselineProfile {
 
 tasks.withType<KotlinJvmCompile>().configureEach {
   compilerOptions {
-    jvmTarget.set(JvmTarget.JVM_11)
+    jvmTarget.set(JvmTarget.JVM_17)
 
   }
 }