Merge pull request #21 from arkivanov/kotlin-2-new

Updated Kotlin to 2.0.0, Decompose to 3.1.0 and other dependencies
arkivanov · Jul 11, 2024 · 28b428c · 28b428c
2 parents 16813fc + c7a048c
commit 28b428c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@ venv
 /dist
 /mkdocs_material.egg-info
 .vscode
+.kotlin
diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts
@@ -2,6 +2,7 @@
 
 plugins {
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.compose)
 }
@@ -45,4 +46,4 @@ dependencies {
     implementation(project(":compose-ui"))
     implementation(libs.androidx.activity.activityCompose)
     implementation(compose.foundation)
-}
+}
diff --git a/app-desktop/build.gradle.kts b/app-desktop/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.jetbrains.compose)
 }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.android.application).apply(false)
     alias(libs.plugins.android.library).apply(false)
     alias(libs.plugins.kotlin.android).apply(false)
+    alias(libs.plugins.kotlin.compose).apply(false)
     alias(libs.plugins.kotlin.multiplatform).apply(false)
     alias(libs.plugins.kotlin.serialization).apply(false)
     alias(libs.plugins.jetbrains.compose).apply(false)

diff --git a/compose-ui/build.gradle.kts b/compose-ui/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.kotlin.compose)
 }
 
 kotlin {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,25 +1,26 @@
 [versions]
 
 project = "1.0.0"
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 agp = "8.2.0"
 jvmTarget = "11"
 
 android-minSdk = "24"
 android-compileSdk = "34"
 android-targetSdk = "34"
 
-compose-jetbrains = "1.6.2"
+compose-jetbrains = "1.6.11"
 
 androidx-activityCompose = "1.9.0"
 
-decompose = "3.0.0"
-essenty = "2.0.0"
+decompose = "3.1.0"
+essenty = "2.1.0"
 
 [plugins]
 
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,3 +18,4 @@ venv @@
     /dist
     /mkdocs_material.egg-info
     .vscode
+    .kotlin