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
43 lines
1.3 KiB
Kotlin
43 lines
1.3 KiB
Kotlin
pluginManagement {
|
|
repositories {
|
|
google {
|
|
content {
|
|
includeGroupByRegex("com\\.android.*")
|
|
includeGroupByRegex("com\\.google.*")
|
|
includeGroupByRegex("androidx.*")
|
|
}
|
|
}
|
|
mavenCentral()
|
|
gradlePluginPortal()
|
|
}
|
|
}
|
|
|
|
// NB: deliberately NO Gradle Java-toolchain auto-download resolver plugin here.
|
|
// Consuming apps build this as an included build, and Calendula publishes via
|
|
// official F-Droid reproducible builds whose offline source scanner rejects any
|
|
// toolchain resolver that can fetch a JDK at build time. Modules set jvmTarget
|
|
// directly and must not add a Java toolchain block that needs such a resolver.
|
|
|
|
dependencyResolutionManagement {
|
|
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
|
repositories {
|
|
google()
|
|
mavenCentral()
|
|
}
|
|
}
|
|
|
|
// floret-kit — the shared Material 3 Expressive design system + plumbing for the
|
|
// Floret family of apps (Calendula, Agendula, …). Consumed by each app as a git
|
|
// submodule wired in via Gradle `includeBuild`, built from source (F-Droid-safe).
|
|
rootProject.name = "floret-kit"
|
|
|
|
include(":core-time")
|
|
include(":core-reminders")
|
|
include(":core-locale")
|
|
include(":core-crash")
|
|
include(":core-prefs")
|
|
include(":core-di")
|
|
include(":identity")
|
|
include(":components")
|
|
include(":glance")
|