cilly/Neon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(ui): move to official material3, and remove jvm target

Browse source 
JetBrains Compose lags behind a bit, currently the new expressive lists
are only available in official

This also makes it easier to develop for now; moving to desktop later on
should be trivial
This commit is contained in:
Cilly Leang 2026-01-28 02:34:24 +11:00
parent 40d07707cf
commit 41f2b9782a
Signed by: cilly
GPG key ID: 6500251E087653C9
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gradle/libs.versions.toml
View file

@ -12,7 +12,7 @@ androidx-lifecycle = "2.10.0-alpha07"
androidx-nav3 = "1.0.0-alpha06"
androidx-testExt = "1.3.0"
composeHotReload = "1.0.0"
composeMultiplatform = "1.10.0"
composeMultiplatform = "1.11.0-alpha02"
desugar = "2.1.5"
hcaptcha = "4.4.0"
junit = "4.13.2"
@ -20,6 +20,7 @@ kermit = "2.0.8"
kotlin = "2.3.0"
kotlinx-coroutines = "1.10.2"
material3 = "1.10.0-alpha05"
material3-google = "1.5.0-alpha12"
material3-adaptive = "1.3.0-alpha03"
metro = "0.10.0"
settings = "1.3.0"
@ -46,6 +47,7 @@ androidx-nav3-ui = { module = "org.jetbrains.androidx.navigation3:navigation3-ui
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" }
compose-material3-google = { module = "androidx.compose.material3:material3", version.ref = "material3-google" }
compose-material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version.ref = "material3-adaptive" }
compose-material3-adaptive-nav3 = { module = "org.jetbrains.compose.material3.adaptive:adaptive-navigation3", version.ref = "material3-adaptive" }
compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatform" }

14
ui/build.gradle.kts
View file

@ -18,7 +18,7 @@ kotlin {
}
}
jvm()
// jvm()
sourceSets {
androidMain.dependencies {
@ -32,7 +32,7 @@ kotlin {
implementation(project(":core"))
implementation(libs.compose.runtime)
implementation(libs.compose.foundation)
implementation(libs.compose.material3)
implementation(libs.compose.material3.google)
implementation(libs.compose.ui)
implementation(libs.compose.components.resources)
implementation(libs.compose.uiToolingPreview)
@ -51,10 +51,10 @@ kotlin {
commonTest.dependencies {
implementation(libs.kotlin.test)
}
jvmMain.dependencies {
implementation(compose.desktop.currentOs)
implementation(libs.kotlinx.coroutinesSwing)
}
// jvmMain.dependencies {
// implementation(compose.desktop.currentOs)
// implementation(libs.kotlinx.coroutinesSwing)
// }
}
}
@ -104,5 +104,7 @@ compose.desktop {
}
compose.resources {
publicResClass = true
packageOfResClass = "moe.lava.neon.resources"
generateResClass = always
}