Merge pull request #24 from skydoves/kotlin/2.2.0

Bump Kotlin to 2.2.10 and JVM target to 17

Author: skydoves

app/build.gradle.kts

@@ -1,4 +1,5 @@
-@Suppress("DSL_SCOPE_VIOLATION")
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
   id(libs.plugins.android.application.get().pluginId)
   id(libs.plugins.kotlin.android.get().pluginId)
@@ -23,12 +24,14 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
-  kotlinOptions {
-    jvmTarget = libs.versions.jvmTarget.get()
+  kotlin {
+    compilerOptions {
+      jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
+    }
   }
 
   packaging {

build.gradle.kts

@@ -1,4 +1,6 @@
-@Suppress("DSL_SCOPE_VIOLATION")
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
+
 plugins {
   alias(libs.plugins.android.application) apply false
   alias(libs.plugins.android.library) apply false
@@ -13,12 +15,16 @@ plugins {
 
 subprojects {
   if (name != "app") {
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-      kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
-      kotlinOptions.freeCompilerArgs += listOf(
-        "-Xexplicit-api=strict",
-        "-Xopt-in=kotlin.contracts.ExperimentalContracts"
-      )
+    tasks.withType<KotlinJvmCompile>().configureEach {
+      compilerOptions {
+        jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
+        freeCompilerArgs.addAll(
+          listOf(
+            "-Xexplicit-api=strict",
+            "-Xopt-in=kotlin.contracts.ExperimentalContracts"
+          )
+        )
+      }
     }
   }
 
@@ -27,7 +33,7 @@ subprojects {
     kotlin {
       target("**/*.kt")
       targetExclude("$buildDir/**/*.kt")
-      ktlint().setUseExperimental(true).editorConfigOverride(
+      ktlint().editorConfigOverride(
         mapOf(
           "indent_size" to "2",
           "continuation_indent_size" to "2"

buildSrc/src/main/kotlin/Configuration.kt

@@ -1,6 +1,6 @@
 object Configuration {
-  const val compileSdk = 34
-  const val targetSdk = 34
+  const val compileSdk = 36
+  const val targetSdk = 36
   const val minSdk = 21
   const val majorVersion = 1
   const val minorVersion = 2

gradle/libs.versions.toml

@@ -1,19 +1,19 @@
 [versions]
-agp = "8.6.1"
-kotlin = "2.0.21"
-dokka = "1.9.0"
-nexusPlugin = "0.30.0"
-kotlinBinaryCompatibility = "0.16.3"
-jvmTarget = "11"
+agp = "8.12.0"
+kotlin = "2.2.10"
+dokka = "2.0.0"
+nexusPlugin = "0.34.0"
+kotlinBinaryCompatibility = "0.18.1"
+jvmTarget = "17"
 material = "1.12.0"
-androidxActivity = "1.9.2"
-androidxAppCompat = "1.7.0"
-androidxCompose = "1.7.3"
-landscapist = "2.4.1"
+androidxActivity = "1.10.1"
+androidxAppCompat = "1.7.1"
+androidxCompose = "1.9.0"
+landscapist = "2.5.1"
 coroutines = "1.7.3"
 retrofit = "2.9.0"
 retrofitAdapters = "1.0.9"
-robolectric = "4.12.1"
+robolectric = "4.15.1"
 spotless = "6.19.0"
 
 [plugins]

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
-#Tue Oct 15 22:13:09 KST 2024
+#Fri Aug 15 16:53:03 KST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

whatif-android/build.gradle.kts

@@ -1,4 +1,6 @@
-@Suppress("DSL_SCOPE_VIOLATION")
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
+
 plugins {
   id(libs.plugins.android.library.get().pluginId)
   id(libs.plugins.kotlin.android.get().pluginId)
@@ -30,12 +32,14 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
-  kotlinOptions {
-    jvmTarget = libs.versions.jvmTarget.get()
+  kotlin {
+    compilerOptions {
+      jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
+    }
   }
 }
 

whatif/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
   id(libs.plugins.android.library.get().pluginId)
   id(libs.plugins.nexus.plugin.get().pluginId)
@@ -39,9 +41,8 @@ kotlin {
   }
 
   jvm {
-    libs.versions.jvmTarget.get().toInt()
-    compilations.all {
-      kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
+    compilerOptions {
+      jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
     }
   }
 
@@ -66,8 +67,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 }