kodein-di-framework-android-x-compose is now an Android lib not a jb-…

…compose one.
kosi-libs · Aug 11, 2023 · 5caf410 · 5caf410
1 parent 34921c0
commit 5caf410
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
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
@@ -1,20 +1,20 @@
 plugins {
-    kodein.library.mppWithAndroid
-    alias(libs.plugins.compose)
+    kodein.library.android
 }
 
-kotlin.kodein {
-    common.mainDependencies {
-        compileOnly(kotlin.compose.runtime)
-        api(projects.framework.compose.kodeinDiFrameworkCompose)
-    }
+dependencies {
+    api(projects.framework.compose.kodeinDiFrameworkCompose)
+    implementation(libs.android.compose.navigation)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.runtime)
+}
 
-    android {
-        sources.mainDependencies {
-            api(projects.framework.android.kodeinDiFrameworkAndroidX)
-            implementation(libs.android.x.lifecycle.viewmodel.compose)
-            implementation(libs.android.compose.navigation)
-        }
+android {
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
 }
 

diff --git a/...mpose/src/androidMain/AndroidManifest.xml → ...id-x-compose/src/main/AndroidManifest.xml b/...mpose/src/androidMain/AndroidManifest.xml → ...id-x-compose/src/main/AndroidManifest.xml
diff --git a/...e/android/KodeinViewModelScopedFactory.kt → ...e/android/KodeinViewModelScopedFactory.kt b/...e/android/KodeinViewModelScopedFactory.kt → ...e/android/KodeinViewModelScopedFactory.kt
diff --git a/...e/android/navigation/navGraphViewModel.kt → ...e/android/navigation/navGraphViewModel.kt b/...e/android/navigation/navGraphViewModel.kt → ...e/android/navigation/navGraphViewModel.kt
diff --git a/...rg/kodein/di/compose/android/viewModel.kt → ...rg/kodein/di/compose/android/viewModel.kt b/...rg/kodein/di/compose/android/viewModel.kt → ...rg/kodein/di/compose/android/viewModel.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,8 @@ androidx-lifecycle = "2.5.1"
 androidx-compose = "2.5.3"
 # Compose
 jbCompose = "1.4.0-dev-wasm06"
-composeCompiler = "1.4.3"
+compose-compiler = "1.4.5"
+compose-bom = "2023.06.01"
 # KSP
 kotlinpoet = "1.12.0"
 ksp = "1.8.10-1.0.9"
@@ -37,6 +38,8 @@ android-x-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-vie
 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" }
 # KSP
 kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
 kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet" }