From 83af44002c30e97ad202fc55b5fe8aeb62be052f Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Sun, 24 May 2026 09:32:25 +0700 Subject: [PATCH] chore: restructure and update dependencies --- composeApp/build.gradle.kts | 9 ++++----- .../src/androidMain/kotlin/su/reya/coop/App.kt | 4 ++++ gradle/libs.versions.toml | 16 ++++++++++------ shared/build.gradle.kts | 10 +++++----- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 336eed5..4d54518 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -19,15 +19,12 @@ kotlin { androidMain.dependencies { implementation(libs.compose.uiToolingPreview) implementation(libs.androidx.activity.compose) - implementation("androidx.navigation:navigation-compose:2.8.8") - implementation("androidx.datastore:datastore-preferences:1.2.1") - implementation("androidx.datastore:datastore-preferences-core:1.2.1") - implementation("org.jetbrains.compose.material3:material3:1.11.0-alpha07") + implementation(libs.androidx.navigation.compose) + implementation(libs.androidx.lifecycle.process) implementation("io.coil-kt.coil3:coil-compose:3.4.0") implementation("io.coil-kt.coil3:coil-network-okhttp:3.4.0") implementation("su.reya:nostr-sdk-kmp:0.2.3") implementation("io.github.kalinjul.easyqrscan:scanner:0.7.0") - implementation("androidx.lifecycle:lifecycle-process:2.8.0") implementation("io.github.alexzhirkevich:qrose:1.1.2") } commonMain.dependencies { @@ -39,6 +36,8 @@ kotlin { implementation(libs.compose.uiToolingPreview) implementation(libs.androidx.lifecycle.viewmodelCompose) implementation(libs.androidx.lifecycle.runtimeCompose) + implementation(libs.androidx.datastore.preferences) + implementation(libs.androidx.datastore) implementation(projects.shared) } commonTest.dependencies { diff --git a/composeApp/src/androidMain/kotlin/su/reya/coop/App.kt b/composeApp/src/androidMain/kotlin/su/reya/coop/App.kt index 8185f79..4cba833 100644 --- a/composeApp/src/androidMain/kotlin/su/reya/coop/App.kt +++ b/composeApp/src/androidMain/kotlin/su/reya/coop/App.kt @@ -15,8 +15,10 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.MaterialExpressiveTheme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.MotionScheme import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text +import androidx.compose.material3.Typography import androidx.compose.material3.darkColorScheme import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicLightColorScheme @@ -100,6 +102,8 @@ fun App() { MaterialExpressiveTheme( colorScheme = colorScheme, + typography = Typography(), + motionScheme = MotionScheme.expressive(), ) { CompositionLocalProvider( LocalNostrViewModel provides viewModel, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1a4e31f..12c2ae8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,16 +8,19 @@ androidx-appcompat = "1.7.1" androidx-core = "1.18.0" androidx-espresso = "3.7.0" androidx-lifecycle = "2.10.0" -androidx-navigation = "2.8.8" +androidx-navigation = "2.9.8" androidx-testExt = "1.3.0" -composeMultiplatform = "1.10.3" +composeMultiplatform = "1.11.0" +datastorePreferences = "1.2.1" junit = "4.13.2" -kotlin = "2.3.20" -kotlinx-serialization = "1.8.0" -material3 = "1.10.0-alpha05" -ktor = "3.4.3" +kotlin = "2.3.21" +kotlinx-serialization = "1.11.0" +material3 = "1.11.0-alpha07" +ktor = "3.5.0" [libraries] +androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" } +androidx-datastore = { module = "androidx.datastore:datastore", version.ref = "datastorePreferences" } kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } kotlin-testJunit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } junit = { module = "junit:junit", version.ref = "junit" } @@ -31,6 +34,7 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa compose-uiTooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "composeMultiplatform" } androidx-lifecycle-viewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } +androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "androidx-lifecycle" } compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "composeMultiplatform" } compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "composeMultiplatform" } compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "material3" } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index dd1d5c4..61f2391 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -25,15 +25,15 @@ kotlin { sourceSets { commonMain.dependencies { - implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.8.0") - implementation("su.reya:nostr-sdk-kmp:0.2.3") - implementation("com.squareup.okio:okio:3.16.2") implementation(libs.ktor.client.core) implementation(libs.ktor.client.websockets) implementation(libs.ktor.client.content.negotiation) implementation(libs.ktor.serialization.kotlinx.json) + implementation(libs.androidx.lifecycle.viewmodelCompose) + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.8.0") + implementation("su.reya:nostr-sdk-kmp:0.2.3") + implementation("com.squareup.okio:okio:3.16.2") } androidMain.dependencies { implementation(libs.ktor.client.okhttp)