From 1088c47d86ba783d7a3b437e1f93b75978875ba9 Mon Sep 17 00:00:00 2001 From: Romain Boisselle Date: Fri, 17 Nov 2023 17:11:27 +0100 Subject: [PATCH] fix compose modules compilation --- .../kotlin/org/kodein/di/compose/diFromAppContext.kt | 2 ++ .../src/jvmMain/kotlin/org/kodein/di/compose/jvmContext.kt | 2 ++ .../kotlin/org/kodein/di/compose/diFromAppContext.kt | 5 ----- gradle/libs.versions.toml | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) rename framework/compose/kodein-di-framework-compose/src/{jsMain => jsBasedMain}/kotlin/org/kodein/di/compose/diFromAppContext.kt (70%) delete mode 100644 framework/compose/kodein-di-framework-compose/src/wasmMain/kotlin/org/kodein/di/compose/diFromAppContext.kt diff --git a/framework/compose/kodein-di-framework-compose/src/jsMain/kotlin/org/kodein/di/compose/diFromAppContext.kt b/framework/compose/kodein-di-framework-compose/src/jsBasedMain/kotlin/org/kodein/di/compose/diFromAppContext.kt similarity index 70% rename from framework/compose/kodein-di-framework-compose/src/jsMain/kotlin/org/kodein/di/compose/diFromAppContext.kt rename to framework/compose/kodein-di-framework-compose/src/jsBasedMain/kotlin/org/kodein/di/compose/diFromAppContext.kt index eee11eb2..e6ba9fbb 100644 --- a/framework/compose/kodein-di-framework-compose/src/jsMain/kotlin/org/kodein/di/compose/diFromAppContext.kt +++ b/framework/compose/kodein-di-framework-compose/src/jsBasedMain/kotlin/org/kodein/di/compose/diFromAppContext.kt @@ -1,5 +1,7 @@ package org.kodein.di.compose +import androidx.compose.runtime.Composable import org.kodein.di.DI +@Composable internal actual fun diFromAppContext(): DI = error("Missing DI container!") diff --git a/framework/compose/kodein-di-framework-compose/src/jvmMain/kotlin/org/kodein/di/compose/jvmContext.kt b/framework/compose/kodein-di-framework-compose/src/jvmMain/kotlin/org/kodein/di/compose/jvmContext.kt index eee11eb2..e6ba9fbb 100644 --- a/framework/compose/kodein-di-framework-compose/src/jvmMain/kotlin/org/kodein/di/compose/jvmContext.kt +++ b/framework/compose/kodein-di-framework-compose/src/jvmMain/kotlin/org/kodein/di/compose/jvmContext.kt @@ -1,5 +1,7 @@ package org.kodein.di.compose +import androidx.compose.runtime.Composable import org.kodein.di.DI +@Composable internal actual fun diFromAppContext(): DI = error("Missing DI container!") diff --git a/framework/compose/kodein-di-framework-compose/src/wasmMain/kotlin/org/kodein/di/compose/diFromAppContext.kt b/framework/compose/kodein-di-framework-compose/src/wasmMain/kotlin/org/kodein/di/compose/diFromAppContext.kt deleted file mode 100644 index eee11eb2..00000000 --- a/framework/compose/kodein-di-framework-compose/src/wasmMain/kotlin/org/kodein/di/compose/diFromAppContext.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.kodein.di.compose - -import org.kodein.di.DI - -internal actual fun diFromAppContext(): DI = error("Missing DI container!") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5cf2e8e2..640e76ae 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ androidx-lifecycle = "2.6.2" androidx-compose = "2.7.5" # Compose jbCompose = "1.5.10-dev-wasm02" -compose-compiler = "1.5.1" +compose-compiler = "1.5.4" compose-bom = "2023.10.01" # KSP kotlinpoet = "1.14.2"