update dependencies

petervelosy · Aug 7, 2024 · b1b172a · b1b172a
1 parent 89c55e0
commit b1b172a
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 46 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
 }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.compose) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.vanniktech.base) apply false
 }
 

diff --git a/data-table-material/build.gradle.kts b/data-table-material/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.android.library)
     alias(libs.plugins.vanniktech.base)
 }
@@ -12,10 +13,8 @@ kotlin {
     androidTarget {
         publishLibraryVariants("release")
     }
-    jvm("desktop") {
-        jvmToolchain(11)
-    }
-    js(IR) {
+    jvm()
+    js {
         browser()
     }
 
@@ -41,12 +40,14 @@ kotlin {
                 implementation(libs.junit)
             }
         }
-        val desktopMain by getting {
+        val jvmMain by getting {
             dependencies {
                 api(compose.preview)
             }
         }
     }
+
+    jvmToolchain(11)
 }
 
 android {

diff --git a/...e-material/src/commonMain/kotlin/com/seanproctor/datatable/material/PaginatedDataTable.kt b/...e-material/src/commonMain/kotlin/com/seanproctor/datatable/material/PaginatedDataTable.kt
@@ -1,19 +1,15 @@
 package com.seanproctor.datatable.material
 
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.LastPage
 import androidx.compose.material.icons.filled.ChevronLeft
 import androidx.compose.material.icons.filled.ChevronRight
 import androidx.compose.material.icons.filled.FirstPage
-import androidx.compose.material.icons.filled.LastPage
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -78,7 +74,7 @@ fun PaginatedDataTable(
                     onClick = { state.pageIndex = pageCount - 1 },
                     enabled = state.pageIndex < pageCount - 1
                 ) {
-                    Icon(Icons.Default.LastPage, "Last")
+                    Icon(Icons.AutoMirrored.Filled.LastPage, "Last")
                 }
             }
         },

diff --git a/data-table-material3/build.gradle.kts b/data-table-material3/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.android.library)
     alias(libs.plugins.vanniktech.base)
 }
@@ -12,10 +13,8 @@ kotlin {
     androidTarget {
         publishLibraryVariants("release")
     }
-    jvm("desktop") {
-        jvmToolchain(11)
-    }
-    js(IR) {
+    jvm()
+    js {
         browser()
     }
 
@@ -41,12 +40,14 @@ kotlin {
                 implementation(libs.junit)
             }
         }
-        val desktopMain by getting {
+        val jvmMain by getting {
             dependencies {
                 api(compose.preview)
             }
         }
     }
+
+    jvmToolchain(11)
 }
 
 android {

diff --git a/data-table/build.gradle.kts b/data-table/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.android.library)
     alias(libs.plugins.vanniktech.base)
 }
@@ -12,10 +13,8 @@ kotlin {
     androidTarget {
         publishLibraryVariants("release")
     }
-    jvm("desktop") {
-        jvmToolchain(11)
-    }
-    js(IR) {
+    jvm()
+    js {
         browser()
     }
 
@@ -40,12 +39,14 @@ kotlin {
                 implementation(libs.junit)
             }
         }
-        val desktopMain by getting {
+        val jvmMain by getting {
             dependencies {
                 api(compose.preview)
             }
         }
     }
+
+    jvmToolchain(11)
 }
 
 android {

diff --git a/demo-common/build.gradle.kts b/demo-common/build.gradle.kts
@@ -3,15 +3,14 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.android.library)
 }
 
 kotlin {
     androidTarget()
-    jvm("desktop") {
-        jvmToolchain(11)
-    }
-    js(IR) {
+    jvm()
+    js {
         browser()
     }
     sourceSets {
@@ -22,6 +21,8 @@ kotlin {
             }
         }
     }
+
+    jvmToolchain(11)
 }
 
 android {

diff --git a/demo-common/src/commonMain/kotlin/com/seanproctor/datatable/demo/App.kt b/demo-common/src/commonMain/kotlin/com/seanproctor/datatable/demo/App.kt
@@ -1,6 +1,7 @@
 package com.seanproctor.datatable.demo
 
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Text
@@ -27,6 +28,7 @@ fun App(onRowClick: (Int) -> Unit) {
         else -> throw IllegalStateException("Invalid column index")
     }
 
+    LazyColumn {  }
     PaginatedDataTable(
         columns = listOf(
             DataColumn(
@@ -47,10 +49,10 @@ fun App(onRowClick: (Int) -> Unit) {
                 Text("Column2")
             },
         ),
-        state = rememberPaginatedDataTableState(5),
+        state = rememberPaginatedDataTableState(15),
         sortColumnIndex = sortColumnIndex,
         sortAscending = sortAscending,
-        modifier = Modifier.verticalScroll(rememberScrollState()).fillMaxWidth(),
+        modifier = Modifier.fillMaxWidth(),
     ) {
         sortedData.forEachIndexed { index, data ->
             row(onClick = { onRowClick(index) }) {

diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
@@ -1,17 +1,16 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 group = "com.seanproctor"
 version = "1.0-SNAPSHOT"
 
 
 kotlin {
-    jvm {
-        jvmToolchain(11)
-        withJava()
-    }
+    jvm()
+
     sourceSets {
         val jvmMain by getting {
             dependencies {
@@ -20,6 +19,8 @@ kotlin {
             }
         }
     }
+
+    jvmToolchain(11)
 }
 
 compose.desktop {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,16 +1,4 @@
-[versions]
-
-activityCompose = "1.9.0"
-kotlin = "1.9.23"
-androidGradlePlugin = "8.2.2"
-junit = "4.13.2"
-compose = "1.6.2"
-vanniktech = "0.27.0"
-
-[libraries]
-
-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
-junit = { module = "junit:junit", version.ref = "junit" }
+## Generated by $ ./gradlew refreshVersionsCatalog
 
 [plugins]
 
@@ -19,4 +7,27 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 vanniktech-base = { id = "com.vanniktech.maven.publish.base", version.ref = "vanniktech" }
+
+[versions]
+
+activityCompose = "1.9.1"
+kotlin = "2.0.10"
+androidGradlePlugin = "8.2.2"
+##               ⬆ = "8.3.0"
+##               ⬆ = "8.3.1"
+##               ⬆ = "8.3.2"
+##               ⬆ = "8.4.0"
+##               ⬆ = "8.4.1"
+##               ⬆ = "8.4.2"
+##               ⬆ = "8.5.0"
+##               ⬆ = "8.5.1"
+junit = "4.13.2"
+compose = "1.6.11"
+vanniktech = "0.29.0"
+
+[libraries]
+
+activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
+junit = { module = "junit:junit", version.ref = "junit" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -7,6 +7,19 @@ pluginManagement {
     }
 }
 
+plugins {
+    // See https://jmfayard.github.io/refreshVersions
+    id("de.fayard.refreshVersions") version "0.60.5"
+}
+
 rootProject.name = "compose-data-table"
 
 include(":android", ":desktop", ":demo-common", ":data-table", ":data-table-material", ":data-table-material3")
+
+refreshVersions {
+    file("build/tmp/refreshVersions").mkdirs()
+    versionsPropertiesFile = file("build/tmp/refreshVersions/versions.properties")
+    rejectVersionIf {
+        candidate.stabilityLevel.isLessStableThan(current.stabilityLevel)
+    }
+}