From 234feb8676876a1531b95ddcfaac4378e7bae549 Mon Sep 17 00:00:00 2001
From: Romain Boisselle <romain.boisselle@proton.me>
Date: Thu, 30 Nov 2023 20:19:05 +0100
Subject: [PATCH] fix: kotlin 1.9.21

---
 .github/workflows/release.yml                        |  2 +-
 build.gradle.kts                                     |  4 +---
 .../build.gradle.kts                                 | 12 +++++++-----
 .../kodein-di-framework-compose/build.gradle.kts     |  6 ++++++
 gradle/libs.versions.toml                            | 12 ++++++------
 settings.gradle.kts                                  |  3 ++-
 6 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b780d3d3..6fd11ac5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -55,7 +55,7 @@ jobs:
           cmake: 3.10.2.4988404
           script: ./gradlew connectedCheck
       - name: Upload
-        run: ./gradlew publishAllPublicationsToOssrhStagingRepository -Porg.kodein.sonatype.repositoryId=${{ needs.create-staging-repository.outputs.repository_id }}
+        run: ./gradlew publishAllPublicationsToOssrhStagingRepository -Porg.kodein.sonatype.repositoryId=${{ needs.create-staging-repository.outputs.repository-id }}
         shell: bash
 
   drop-or-release:
diff --git a/build.gradle.kts b/build.gradle.kts
index 83d61bf6..88ae946c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,9 +3,7 @@ plugins {
     alias(libs.plugins.ksp) apply false
 }
 
-kodein.experimentalCompose(libs.versions.jbCompose)
-
 allprojects {
     group = "org.kodein.di"
-    version = "7.21.0"
+    version = "7.21.1"
 }
diff --git a/framework/compose/kodein-di-framework-android-x-compose/build.gradle.kts b/framework/compose/kodein-di-framework-android-x-compose/build.gradle.kts
index 12056b77..b24575d3 100644
--- a/framework/compose/kodein-di-framework-android-x-compose/build.gradle.kts
+++ b/framework/compose/kodein-di-framework-android-x-compose/build.gradle.kts
@@ -1,15 +1,17 @@
 plugins {
     kodein.library.android
+    alias(libs.plugins.compose)
 }
 
 dependencies {
     api(projects.framework.compose.kodeinDiFrameworkCompose)
-    implementation(libs.android.compose.navigation)
-    implementation(platform(libs.compose.bom))
-    implementation(libs.compose.runtime)
+    implementation(libs.android.x.compose.navigation)
+    implementation(platform(libs.android.compose.bom))
+    implementation(libs.android.compose.runtime)
 }
 
 android {
+    namespace = "org.kodein.di.compose.android"
     buildFeatures {
         compose = true
     }
@@ -18,8 +20,8 @@ android {
     }
 }
 
-android {
-    namespace = "org.kodein.di.compose.android"
+compose {
+    kotlinCompilerPlugin.set(libs.versions.compose.compiler.get())
 }
 
 kodeinUpload {
diff --git a/framework/compose/kodein-di-framework-compose/build.gradle.kts b/framework/compose/kodein-di-framework-compose/build.gradle.kts
index 31cd98f3..db8ac04e 100644
--- a/framework/compose/kodein-di-framework-compose/build.gradle.kts
+++ b/framework/compose/kodein-di-framework-compose/build.gradle.kts
@@ -6,6 +6,8 @@ plugins {
 kotlin.kodein {
     jsEnv()
 
+//    allComposeStable()
+    // 1.5.11 does not work with compose WasmJS yet
     allComposeExperimental()
 
     common.mainDependencies {
@@ -21,6 +23,10 @@ kotlin.kodein {
     }
 }
 
+compose {
+    kotlinCompilerPlugin.set(libs.versions.compose.compiler.get())
+}
+
 android {
     namespace = "org.kodein.di.compose"
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 640e76ae..72cd94d5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # Core
-kaverit = "2.8.0"
+kaverit = "2.8.1"
 # Android
 android-appcompat = "28.0.0"
 androidx-appcompat = "1.6.1"
@@ -8,8 +8,8 @@ androidx-fragment = "1.6.2"
 androidx-lifecycle = "2.6.2"
 androidx-compose = "2.7.5"
 # Compose
-jbCompose = "1.5.10-dev-wasm02"
-compose-compiler = "1.5.4"
+jbCompose = "1.5.10-dev-wasm03"
+compose-compiler = "1.5.5"
 compose-bom = "2023.10.01"
 # KSP
 kotlinpoet = "1.14.2"
@@ -37,9 +37,9 @@ android-x-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.re
 android-x-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
 android-x-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" }
 android-x-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
-android-compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-compose" }
-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
-compose-runtime = { module = "androidx.compose.runtime:runtime" }
+android-x-compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-compose" }
+android-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
+android-compose-runtime = { module = "androidx.compose.runtime:runtime" }
 # KSP
 kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
 kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d7a31c4f..103eff9e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,10 +4,11 @@ import org.kodein.internal.gradle.settings.framework
 buildscript {
     repositories {
         mavenLocal()
+        gradlePluginPortal()
         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.3.1")
+        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.5.1")
     }
 }