update compose

Author: PPetka

buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/BaseAndroidSetup.kt

@@ -13,7 +13,7 @@ fun Project.baseAndroidSetup() {
         if (project.plugins.hasPlugin("com.android.library")) {
             sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
-        if (project.plugins.hasPlugin(libs.plugins.compose.get().pluginId)) {
+        if (project.plugins.hasPlugin(libs.plugins.kotlin.compose.get().pluginId)) {
             buildFeatures.compose = true
         }
         defaultConfig {

charts/build.gradle.kts

@@ -3,30 +3,29 @@ import com.netguru.multiplatform.charts.extensions.commonMain
 import com.netguru.multiplatform.charts.extensions.commonTest
 import com.netguru.multiplatform.charts.extensions.kotlin
 import com.netguru.multiplatform.charts.extensions.sourceSets
-import org.jetbrains.compose.compose
 import java.net.URL
 
 baseAndroidSetup()
 
 plugins {
-    alias(libs.plugins.compose)
+    alias(libs.plugins.kotlin.compose)
     kotlin("multiplatform")
     id("com.android.library")
     alias(libs.plugins.dokka)
 }
 
 kotlin {
-    android()
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
         commonMain {
             dependencies {
-                api(compose.runtime)
-                api(compose.ui)
-                api(compose.foundation)
-                api(compose.material)
-                api(compose.materialIconsExtended)
+                api(libs.compose.runtime)
+                api(libs.compose.ui)
+                api(libs.compose.foundation)
+                api(libs.compose.material)
+                api(libs.compose.materialIconsExtended)
             }
         }
         commonTest {
@@ -36,6 +35,9 @@ kotlin {
         }
     }
 }
+android {
+    namespace = "com.netguru.multiplatform.charts"
+}
 
 tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
     dokkaSourceSets {

charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/ChartLegend.kt

@@ -1,15 +1,14 @@
 package com.netguru.multiplatform.charts.line
 
 import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.GridCells
-import androidx.compose.foundation.lazy.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
@@ -30,7 +29,6 @@ import com.netguru.multiplatform.charts.ChartAnimation
 import com.netguru.multiplatform.charts.bar.BarChartConfig
 import com.netguru.multiplatform.charts.grid.GridDefaults
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ChartLegend(
     legendData: List<LegendItemData>,
@@ -41,7 +39,7 @@ fun ChartLegend(
 ) {
     LazyVerticalGrid(
         modifier = modifier,
-        cells = GridCells.Adaptive(200.dp),
+        columns = GridCells.Adaptive(200.dp),
         contentPadding = PaddingValues(
             start = 12.dp,
             top = 16.dp,

charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartLegend.kt

@@ -8,8 +8,8 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.GridCells
-import androidx.compose.foundation.lazy.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -65,7 +65,7 @@ internal fun PieChartLegend(
     LazyVerticalGrid(
         horizontalArrangement = Arrangement.SpaceAround,
         verticalArrangement = Arrangement.SpaceAround,
-        cells = GridCells.Fixed(columnsPerRow),
+        columns = GridCells.Fixed(columnsPerRow),
         content = {
             items(data.count()) { index ->
                 LegendItem(

example-app/android/build.gradle.kts

@@ -5,7 +5,7 @@ baseAndroidSetup()
 plugins {
     kotlin("android")
     @Suppress("DSL_SCOPE_VIOLATION")
-    alias(libs.plugins.compose)
+    alias(libs.plugins.kotlin.compose)
     id("com.android.application")
     id("shot")
 }
@@ -15,8 +15,8 @@ version = libs.versions.project.version.get()
 
 dependencies {
     implementation(libs.androidx.compose)
-    debugImplementation(compose.uiTooling)
-    implementation(compose.preview)
+    debugImplementation(libs.compose.uiTooling)
+    implementation(libs.compose.preview)
     implementation(libs.androidx.window)
     implementation(project(":example-app:application"))
     androidTestImplementation(libs.test.junit)
@@ -41,6 +41,7 @@ android {
             "META-INF/LGPL2.1"
         )
     }
+    namespace = "com.netguru.multiplatform.charts.android"
 }
 
 shot {

example-app/application/build.gradle.kts

@@ -2,7 +2,6 @@ import com.netguru.multiplatform.charts.extensions.androidMain
 import com.netguru.multiplatform.charts.extensions.baseAndroidSetup
 import com.netguru.multiplatform.charts.extensions.baseTestSetup
 import com.netguru.multiplatform.charts.extensions.commonMain
-import org.jetbrains.compose.compose
 
 baseAndroidSetup()
 baseTestSetup()
@@ -11,11 +10,11 @@ plugins {
     kotlin("multiplatform")
     id("com.android.library")
     @Suppress("DSL_SCOPE_VIOLATION")
-    alias(libs.plugins.compose)
+    alias(libs.plugins.kotlin.compose)
 }
 
 kotlin {
-    android()
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
@@ -26,8 +25,11 @@ kotlin {
         }
         androidMain {
             dependencies {
-                api(compose.uiTooling)
+                api(libs.compose.uiTooling)
             }
         }
     }
 }
+android {
+    namespace = "com.netguru.multiplatform.charts.application"
+}

example-app/application/src/commonMain/kotlin/com/netguru/multiplatform/charts/application/screen/GasBottleScreen.kt

@@ -11,9 +11,9 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.GridCells
-import androidx.compose.foundation.lazy.GridItemSpan
-import androidx.compose.foundation.lazy.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.GridItemSpan
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -51,7 +51,7 @@ fun GasBottleChartScreen() {
             modifier = Modifier
                 .fillMaxHeight()
                 .fillMaxWidth(),
-            cells = GridCells.Fixed(numberOfCols),
+            columns = GridCells.Fixed(numberOfCols),
             contentPadding = PaddingValues(AppTheme.dimens.grid_4),
         ) {
             item(span = { GridItemSpan(numberOfCols) }) {

example-app/common/build.gradle.kts

@@ -3,31 +3,30 @@ import com.netguru.multiplatform.charts.extensions.baseAndroidSetup
 import com.netguru.multiplatform.charts.extensions.baseTestSetup
 import com.netguru.multiplatform.charts.extensions.sourceSets
 import org.gradle.kotlin.dsl.kotlin
-import org.jetbrains.compose.compose
 
 baseAndroidSetup()
 baseTestSetup()
 
 plugins {
     kotlin("multiplatform")
     @Suppress("DSL_SCOPE_VIOLATION")
-    alias(libs.plugins.compose)
+    alias(libs.plugins.kotlin.compose)
     id("com.android.library")
 }
 
 kotlin {
-    android()
+    androidTarget()
     jvm("desktop")
 
     sourceSets {
         commonMain {
             kotlin.srcDir("${buildDir.absolutePath}/generated/resources")
             dependencies {
-                api(compose.runtime)
-                api(compose.ui)
-                api(compose.foundation)
-                api(compose.material)
-                api(compose.materialIconsExtended)
+                api(libs.compose.runtime)
+                api(libs.compose.ui)
+                api(libs.compose.foundation)
+                api(libs.compose.material)
+                api(libs.compose.materialIconsExtended)
                 api(libs.time.klock)
                 api(project(":charts"))
             }
@@ -45,6 +44,7 @@ android {
     sourceSets["main"].apply {
         res.srcDirs("src/androidMain/res", "src/commonMain/resources")
     }
+    namespace = "com.netguru.multiplatform.charts.common"
 }
 
 project.rootProject.tasks.apply {

example-app/desktop/build.gradle.kts

@@ -1,11 +1,11 @@
 import com.netguru.multiplatform.charts.extensions.jvmMain
-import org.jetbrains.compose.compose
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
     kotlin("multiplatform")
     @Suppress("DSL_SCOPE_VIOLATION")
-    alias(libs.plugins.compose)
+    alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.compose.desktop)
 }
 
 group = libs.versions.project.group.get()

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 ## SDK Versions
-compileSdk = "31"
+compileSdk = "35"
 minSdk = "24"
 targetSdk = "31"
 versionCode = "1"
@@ -19,11 +19,12 @@ desktop-packageName = "jvm"
 # Dependencies
 kotlin-gradle-plugin = "2.1.10"
 android-gradle-plugin = "8.7.3"
-compose = "1.1.1"
-activity-compose = "1.4.0"
-coroutines = "1.6.0"
-appcompat = "1.4.1"
-core-ktx = "1.7.0"
+jetbrains-compose = "1.7.3"
+activity-compose = "1.10.1"
+compose-test = "1.7.8"
+coroutines = "1.10.2"
+appcompat = "1.7.0"
+core-ktx = "1.16.0"
 junit = "4.13.2"
 window = "1.0.0"
 coroutines-test = "1.6.0"