makiolaj/floret-kit
1
0
Fork 0
Code Actions Packages Projects Releases Activity

Converge sibling branches into main (0.7.0) (#11)

Browse Source 
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
This commit is contained in:
Jean-Luc Makiola
2026-10-07 09:36:15 +02:00
co-authored by makiolaj
parent 318aeab6bd
commit 8b33635a85
55 changed files with 2517 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/ARCHITECTURE.md
+15 -1
View File
@@ -74,6 +74,8 @@ should scan the submodule's Gradle scripts (see §5).
|---|---|---|
| Plumbing | `core-time` (JVM) | Pure logic; no Android, no deps. |
| Plumbing | `core-crash` (Android) | Self-contained subsystem; parameterized per app. |
| Plumbing | `core-prefs` (Android) | Typed DataStore layer. The store's name and construction stay with the app. |
| Plumbing | `core-di` (JVM) | Dispatcher/scope qualifiers + their Hilt module. The only module that knows about DI. |
| Design — identity | `identity` (Android) | Theme factory + motion. App supplies seed/palette. |
| Design — components | `components` (Android) | Shared Compose primitives. App composes screens. |
@@ -93,7 +95,7 @@ Two kinds of module:
- **JVM library** (`core-time`) — `org.jetbrains.kotlin.jvm`, `jvmTarget = 17`,
JUnit 5 + Truth tests. The right home for pure logic; cheapest to build and
test.
- **Android library** (`core-crash`, `identity`, `components`) —
- **Android library** (`core-crash`, `core-prefs`, `identity`, `components`) —
`com.android.library` + the Compose plugin, `compileSdk 37` / `minSdk 29`.
> **AGP 9.x provides built-in Kotlin compilation.** Android modules therefore
@@ -101,6 +103,18 @@ Two kinds of module:
> **not** a separate `org.jetbrains.kotlin.android` plugin (applying it errors).
> They set `jvmTarget` directly in a `kotlin { compilerOptions { … } }` block.
> **An Android module with no Compose in it applies only `com.android.library`**
> — `core-prefs` is the first such module. The Compose plugin is added per
> module, when the module actually has composables.
> **`core-di` is the one module carrying an annotation processor** — the KSP
> plugin plus `hilt-compiler`. A `@Module @InstallIn(...)` only reaches a
> consuming app's Hilt component if the *library* is processed: the app's
> processor reads `@AggregatedDeps` metadata off the classpath, it does not
> reprocess library sources. As a non-Android module it uses `hilt-core` +
> `hilt-compiler` rather than the Android Hilt Gradle plugin. Every other module
> stays DI-free.
Versions live in [`gradle/libs.versions.toml`](../gradle/libs.versions.toml),
kept in lockstep with the apps' catalogs.