Merge pull request #144 from skydoves/chore/bump-versions

chore: Bump Kotlin, Gradle, JVM target

8 files changed, 32 insertions, 23 deletions

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fac2238..2cdf1f0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -62,8 +62,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   packaging {
@@ -97,6 +97,6 @@ android {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
   compilerOptions {
-    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
   }
 }
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
index f8db2f7..51ee902 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -11,12 +11,8 @@ android {
   compileSdk = Configuration.compileSdk
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-  }
-
-  kotlinOptions {
-    jvmTarget = libs.versions.jvmTarget.get()
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   defaultConfig {
@@ -55,3 +51,9 @@ dependencies {
   implementation(libs.androidx.benchmark.macro)
   implementation(libs.androidx.profileinstaller)
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
+  compilerOptions {
+    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+  }
+}
diff --git a/colorpicker-compose/build.gradle.kts b/colorpicker-compose/build.gradle.kts
index 0ac87e8..bf84628 100644
--- a/colorpicker-compose/build.gradle.kts
+++ b/colorpicker-compose/build.gradle.kts
@@ -1,5 +1,7 @@
+@file:OptIn(ExperimentalWasmDsl::class)
+
 import com.github.skydoves.colorpicker.compose.Configuration
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   id(libs.plugins.android.library.get().pluginId)
@@ -123,7 +125,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
   compilerOptions {
-    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
   }
 }
 
diff --git a/docs/build.gradle.kts b/docs/build.gradle.kts
index c228de4..ded71cc 100644
--- a/docs/build.gradle.kts
+++ b/docs/build.gradle.kts
@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:OptIn(ExperimentalWasmDsl::class)
+
 import com.github.skydoves.colorpicker.compose.Configuration
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   id(libs.plugins.kotlin.multiplatform.get().pluginId)
diff --git a/gradle.properties b/gradle.properties
index e5e4f1e..7c5cfea 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -45,7 +45,6 @@ android.defaults.buildfeatures.shaders=false
 android.nonTransitiveRClass=true
 
 # MPP
-kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4aefa77..420fbeb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,11 +2,11 @@
 agp = "8.13.2"
 dokka = "2.1.0"
 nexusPlugin = "0.35.0"
-kotlin = "2.2.21"
+kotlin = "2.3.0"
 kotlinBinaryCompatibility = "0.18.1"
 compose-plugin = "1.9.3"
-jvmTarget = "11"
-androidxActivity = "1.12.1"
+jvmTarget = "17"
+androidxActivity = "1.12.2"
 androidxTest = "1.7.0"
 androidxNavigation = "2.9.1"
 imagePicker = "0.5.2"
@@ -14,13 +14,14 @@ baselineProfiles = "1.4.1"
 macroBenchmark = "1.4.1"
 uiAutomator = "2.3.0"
 spotless = "6.21.0"
-junit = "1.2.1"
-espresso-core = "3.6.1"
+junit = "1.3.0"
+espresso-core = "3.7.0"
 androidxMacroBenchmark = "1.4.1"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+kmp-android-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 android-test = { id = "com.android.test", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d2e95b0..b4f1d89 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 #Tue Aug 19 14:00:43 KST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/wasmApp/build.gradle.kts b/wasmApp/build.gradle.kts
index 0c6232b..22d14bc 100644
--- a/wasmApp/build.gradle.kts
+++ b/wasmApp/build.gradle.kts
@@ -1,3 +1,6 @@
+@file:OptIn(ExperimentalWasmDsl::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {
@@ -13,10 +16,9 @@ kotlin {
       commonWebpackConfig {
         outputFileName = "composeApp.js"
         devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply {
-          static = (static ?: mutableListOf()).apply {
-            // Serve sources to debug inside browser
-            add(project.projectDir.path)
-          }
+          static(
+            directory = project.projectDir.path
+          )
         }
       }
     }
@@ -39,6 +41,6 @@ kotlin {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
   compilerOptions {
-    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
   }
 }