update versions

stslex · Mar 2, 2024 · c7429ad · c7429ad
1 parent 7d76fdf
commit c7429ad
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -99,9 +99,6 @@ android {
     dependencies {
         debugImplementation(libs.compose.ui.tooling)
     }
-    dexOptions {
-        javaMaxHeapSize = "4g"
-    }
 }
 
 compose.desktop {

diff --git a/core/core/build.gradle.kts b/core/core/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.compose.ExperimentalComposeLibrary
+
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidLibrary)

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -51,6 +51,9 @@ kotlin {
             api(compose.components.resources)
             api(libs.bundles.voyager)
             api(libs.kamel)
+
+//            implementation(compose.uiTooling)
+//            implementation(compose.preview)
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,8 +4,8 @@ android-compileSdk = "34"
 android-targetSdk = "34"
 
 logback = "1.4.11"
-compose = "1.6.2"
-compose-plugin = "1.5.11"
+androidCompose = "1.6.2"
+compose-plugin = "1.6.0"
 compose-compiler = "1.5.4"
 agp = "8.2.2"
 androidx-activityCompose = "1.8.2"
@@ -31,16 +31,18 @@ coil = "2.5.0"
 
 buildConfig = "4.2.0"
 lifecycleRuntimeKtx = "2.7.0"
-composeBom = "2024.02.01"
+androixComposeBom = "2024.02.01"
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
-compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
+
+compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidCompose" }
+compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidCompose" }
+compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidCompose" }
+compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidCompose" }
+compose-material = { module = "androidx.compose.material:material", version.ref = "androidCompose" }
+
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" }
 androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-junit" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-espresso-core" }
@@ -83,7 +85,7 @@ coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-androi
 
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
-androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androixComposeBom" }
 androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }