Jean-Luc Makiolaandmakiolaj
8b33635a85
Brings the branches the sibling apps actually ship from back onto main, so floret-kit stops forking per project. Merged in: - `vouch/settings` (what vouch pins), which already contains `feat/clockula` (what clockula pins) and `chore/deps-2026-10`: core-prefs, core-di, CollapsingScaffold FAB/no-back slots, the glance module, LocaleManager on API 33+, and the dependency bump - `feat/glance-module`: the three glance commits clockula's branch didn't have yet (progress ring/tile/check button, expressive shapes + header pill, WidgetDoneState) Both merged without conflicts. Version ends up at 0.7.0 (untagged). Heads-up for consumers: the deps bump moves the toolchain to Gradle 9.8.0 / AGP 9.4.1 / Kotlin 2.4.20. Since floret-kit is a composite build, a consumer must be on Gradle >= 9.6 to pin anything from here on. Calendula builds, tests and lints against this branch with just that toolchain bump, no source changes. Co-authored-by: Jean-Luc Makiola <business@jeanlucmakiola.de> Reviewed-on: https://codeberg.org/jlmakiola/floret-kit/pulls/11
55 lines
3.2 KiB
TOML
55 lines
3.2 KiB
TOML
# Version catalog for floret-kit. Kept in lockstep with the consuming apps'
|
|
# catalogs (same AGP/Kotlin/Compose + test stack) until the catalog itself is shared.
|
|
[versions]
|
|
agp = "9.4.1"
|
|
kotlin = "2.4.20"
|
|
coreKtx = "1.19.1"
|
|
appcompat = "1.8.0"
|
|
activityCompose = "1.13.0"
|
|
composeBom = "2026.09.00"
|
|
# Material 3 Expressive APIs live in the 1.5 alpha line (no stable 1.5 yet); pinned to override the BOM.
|
|
material3 = "1.5.0-alpha29"
|
|
junit = "6.1.3"
|
|
junitPlatform = "6.1.3"
|
|
ksp = "2.3.9"
|
|
hilt = "2.59.2"
|
|
datastore = "1.2.1"
|
|
kotlinxCoroutines = "1.10.2"
|
|
turbine = "1.2.0"
|
|
# Glance: kept in lockstep with the apps' widget stack.
|
|
glance = "1.2.0"
|
|
kotlinxDatetime = "0.7.0"
|
|
truth = "1.4.5"
|
|
|
|
[libraries]
|
|
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
|
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
|
|
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
|
|
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
|
|
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
|
|
androidx-foundation = { group = "androidx.compose.foundation", name = "foundation" }
|
|
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
|
|
androidx-animation = { group = "androidx.compose.animation", name = "animation" }
|
|
androidx-material-icons-core = { group = "androidx.compose.material", name = "material-icons-core" }
|
|
androidx-glance-appwidget = { group = "androidx.glance", name = "glance-appwidget", version.ref = "glance" }
|
|
androidx-glance-material3 = { group = "androidx.glance", name = "glance-material3", version.ref = "glance" }
|
|
kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinxDatetime" }
|
|
|
|
androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" }
|
|
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
|
|
kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
|
|
turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine" }
|
|
hilt-core = { group = "com.google.dagger", name = "hilt-core", version.ref = "hilt" }
|
|
hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" }
|
|
|
|
junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" }
|
|
junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" }
|
|
junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junitPlatform" }
|
|
truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
|
|
|
|
[plugins]
|
|
android-library = { id = "com.android.library", version.ref = "agp" }
|
|
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
|
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
|
|
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
|