Kotlin 2.0

kosi-libs · Apr 29, 2024 · 894481d · 894481d
1 parent 7bf22a7
commit 894481d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,6 @@ package-lock.json
 *.a
 *.o
 *.so
+
+# Kotlin
+.kotlin
diff --git a/framework/compose/kodein-di-framework-compose/build.gradle.kts b/framework/compose/kodein-di-framework-compose/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 kotlin.kodein {
     jsEnv()
 
-    allComposeExperimental()
+    allComposeUi()
 
     common.mainDependencies {
         implementation(kotlin.compose.runtime)

diff --git a/gradle.properties b/gradle.properties
@@ -6,5 +6,9 @@ org.gradle.parallel=true
 android.enableJetifier=true
 android.useAndroidX=true
 
+# Wasm
+org.jetbrains.compose.experimental.wasm.enabled=true
+kotlin.wasm.stability.nowarn=true
+
 # Kosi
 org.kodein.native.enableCrossCompilation=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
 # Core
-kaverit = "2.8.2"
+kaverit = "2.9.0-kotlin-2-SNAPSHOT"
 # Android
 android-appcompat = "28.0.0"
 androidx-appcompat = "1.6.1"
 androidx-fragment = "1.6.2"
-androidx-lifecycle = "2.6.2"
-androidx-compose = "2.7.5"
+androidx-lifecycle = "2.7.0"
+androidx-compose = "2.7.7"
 # Compose
-jbCompose = "1.6.0-alpha01"
-compose-compiler = "1.5.4"
-compose-bom = "2023.10.01"
+jbCompose = "1.6.10-beta02"
+compose-compiler = "1.5.12"
+compose-bom = "2024.04.01"
 # KSP
 kotlinpoet = "1.14.2"
 ksp = "1.9.20-1.0.14"
 # Ktor
-ktor = "2.3.5"
+ktor = "2.3.6"
 # JxInject
 javax-inject = "1"
 # TornadoFX
@@ -25,7 +25,7 @@ tornadofx = "1.7.20"
 testfx = "4.0.4-alpha"
 # Test
 junit = "4.13.2"
-junit-jupiter = "5.6.3"
+junit-jupiter = "5.10.1"
 
 [libraries]
 # Core

diff --git a/kodein-di/build.gradle.kts b/kodein-di/build.gradle.kts
@@ -19,11 +19,6 @@ kotlin.kodein {
     }
 }
 
-kotlin.sourceSets {
-    val jsBasedMain by getting
-    getByName("wasmJsMain").dependsOn(jsBasedMain)
-}
-
 kodeinUpload {
     name = "Kodein"
     description = "Kodein Core"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,7 @@ buildscript {
         maven(url = "https://raw.githubusercontent.com/kosi-libs/kodein-internal-gradle-plugin/mvn-repo")
     }
     dependencies {
-        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.5.1")
+        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.7.0-kotlin-2-LOCAL")
     }
 }
 

diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
@@ -15,8 +15,3 @@ kotlin.kodein {
         }
     }
 }
-
-kotlin.sourceSets {
-    val jsBasedMain by getting
-    getByName("wasmJsMain").dependsOn(jsBasedMain)
-}
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,3 +25,6 @@ package-lock.json @@
     *.a
     *.o
     *.so
+    # Kotlin
+    .kotlin