From c7b26d585594ed3ec1ba3623c5c2ed9a2234c7a4 Mon Sep 17 00:00:00 2001
From: Romain BOISSELLE <romain.boisselle@proton.me>
Date: Mon, 29 Apr 2024 14:34:49 +0200
Subject: [PATCH] Kotlin 2.0

---
 .github/workflows/snapshot.yml                | 28 +++++++++++++++++--
 .gitignore                                    |  3 ++
 .../build.gradle.kts                          |  2 +-
 gradle.properties                             |  4 +++
 gradle/libs.versions.toml                     | 16 +++++------
 kodein-di/build.gradle.kts                    |  5 ----
 settings.gradle.kts                           |  2 +-
 test-utils/build.gradle.kts                   |  5 ----
 8 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 6d08abe7..70c62210 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -14,7 +14,29 @@ on:
       - '!./github/workflow/snapshot.yml'
 
 jobs:
-  build-upload:
+  unit-tests:
+    name: Unit tests
+    runs-on: macOS-latest
+    steps:
+      - name: Setup
+        uses: kosi-libs/kodein-internal-github-actions/setup@main
+      - name: Check
+        run: ./gradlew check
+        shell: bash
+
+  instrumentation-tests:
+    name: Instrumentation tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup
+        uses: kosi-libs/kodein-internal-github-actions/setup@main
+      - name: Check with Android
+        uses: kosi-libs/kodein-internal-github-actions/checkWithAndroid@main
+
+  upload:
+    needs:
+      - unit-tests
+      - instrumentation-tests
     runs-on: macOS-latest
     env:
       SONATYPE_USERNAME: ${{ secrets.sonatype_username }}
@@ -22,8 +44,8 @@ jobs:
     steps:
       - name: Setup
         uses: kosi-libs/kodein-internal-github-actions/setup@main
-      - name: Check with Android
-        uses: kosi-libs/kodein-internal-github-actions/checkWithAndroid@main
+      - name: Gradle cache
+        uses: gradle/gradle-build-action@v3
       - name: Upload
         run: ./gradlew publishAllPublicationsToOssrhStagingRepository -PgitRef=${{ github.ref }} -Psnapshot=true
         shell: bash
diff --git a/.gitignore b/.gitignore
index 87bc3fa5..c12dc4b2 100644
--- 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
index 31cd98f3..f296c551 100644
--- 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
index b5b511f7..6c10768b 100644
--- 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
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 73888be6..acd04cfa 100644
--- 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
index 85359e61..2c8eddfd 100644
--- 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
index 103eff9e..21553c54 100644
--- 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-SNAPSHOT")
     }
 }
 
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index 2aa10766..528ad58c 100644
--- 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)
-}