Fix build errors

linroid · Sep 7, 2023 · 509b329 · 509b329
1 parent 4661fdd
commit 509b329
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/buildSrc/src/main/kotlin/android-setup.gradle.kts b/buildSrc/src/main/kotlin/android-setup.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 23

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,6 +24,7 @@ napier = "2.6.1"
 multiplatform-settings = "1.0.0"
 # https://developer.android.com/kotlin/ktx#core
 android-core-ktx = "1.12.0"
+activity-compose = "1.7.2"
 
 [libraries]
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
@@ -40,12 +41,14 @@ ktor-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
 ktor-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
 
 androidx-core = { module = "androidx.core:core-ktx", version.ref = "android-core-ktx" }
+activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
 
 settings = { module="com.russhwolf:multiplatform-settings",  version.ref = "multiplatform-settings"}
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
 napier = { module = "io.github.aakira:napier", version.ref = "napier"}
 okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
 precompose = { module = "moe.tlaster:precompose", version.ref = "precompose" }
+precompose-viewmodel = { module = "moe.tlaster:precompose-viewmodel", version.ref = "precompose" }
 
 [bundles]
 koin-tests = ["koin-test"]

diff --git a/main/build.gradle.kts b/main/build.gradle.kts
@@ -35,8 +35,9 @@ kotlin {
                 implementation(project(":moonraker"))
                 implementation(project(":ui"))
                 implementation(project(":moonraker"))
-                api(libs.precompose)
-                api(compose.materialIconsExtended)
+                implementation(libs.precompose)
+                implementation(libs.precompose.viewmodel)
+                implementation(compose.materialIconsExtended)
             }
         }
         if (isOnMacOs) {

diff --git a/targets/android/build.gradle.kts b/targets/android/build.gradle.kts
@@ -8,11 +8,12 @@ plugins {
 
 dependencies {
     implementation(project(":main"))
-    implementation("androidx.activity:activity-compose:1.7.2")
+    implementation(libs.precompose)
+    implementation(libs.activity.compose)
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
 
     namespace = "com.linroid.klipperx"
 

diff --git a/targets/desktop/build.gradle.kts b/targets/desktop/build.gradle.kts
@@ -20,6 +20,7 @@ kotlin {
             dependencies {
                 implementation(project(":main"))
                 implementation(compose.desktop.currentOs)
+                implementation(libs.precompose)
             }
         }
     }

diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
@@ -17,7 +17,5 @@ kotlin {
 }
 
 android {
-    android {
-        namespace = "${group}.ui"
-    }
+    namespace = "${group}.ui"
 }