Thiru-tenext
d7348e253f
Design system - MilerSurface ladder (canvas → working → raised → floating) with MilerPanel as layer 1; canvas moved to #DEE3EA so white separates at 1.290:1. - Visible vocabulary applied across Home, Deliveries, Activity, Account and the sheets: hero heads (tabular numeral + small caption, clamped at 1.3x), canvas wells for anything that opens, small filled tags for shelf labels, demoted placeholders. Recorded in DESIGN_SYSTEM.md §6. - One icon family: 222 Material glyphs migrated to Lucide; none left outside lib/xpress. - Colour semantics corrected: amber only for what is genuinely owed, brand red reserved for the live stop, disabled primaries go neutral rather than pale. Data and lifecycle - lib/data/lifecycle.dart reads mutations for what they prove; route_order.dart makes admin sequence the single ordering authority; service_day.dart, and stop_area.dart rewritten against live Coimbatore addresses (digit-token stripping, city stoplist, street suffixes, stammer collapse). - countLabel states the load once, in bags. Testing - 1440 tests passing; golden shot harnesses for Home, Deliveries, Activity, sheets and verify, with test/failures/ now gitignored (diff debris). - New pins: home_gutter_test, stop_area_test, plus updated structural bounds. Note: this commit also carries pre-existing working-tree deletions that were present before this work (API_SPEC.md, README.md, demo test fixtures). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
78 lines
3.0 KiB
Kotlin
78 lines
3.0 KiB
Kotlin
allprojects {
|
|
repositories {
|
|
google()
|
|
mavenCentral()
|
|
}
|
|
}
|
|
|
|
val newBuildDir: Directory =
|
|
rootProject.layout.buildDirectory
|
|
.dir("../../build")
|
|
.get()
|
|
rootProject.layout.buildDirectory.value(newBuildDir)
|
|
|
|
subprojects {
|
|
val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
|
|
project.layout.buildDirectory.value(newSubprojectBuildDir)
|
|
}
|
|
subprojects {
|
|
project.evaluationDependsOn(":app")
|
|
}
|
|
|
|
// ── Compiling maplibre_gl against the JDK we actually have ──
|
|
//
|
|
// `maplibre_gl` is the map engine behind the delivery line's screens (the
|
|
// ported Xpress-rider flow under lib/xpress). Version 0.26.2 declares
|
|
// `sourceCompatibility = 21`, and javac refuses a source release newer than the
|
|
// JDK running the build:
|
|
//
|
|
// Execution failed for task ':maplibre_gl:compileDebugJavaWithJavac'
|
|
// > error: invalid source release: 21
|
|
//
|
|
// Flutter here is configured against JDK 17, so every build fails at that task
|
|
// — including builds of the parcel line, which never loads a MapLibre map.
|
|
//
|
|
// The plugin's own sources are Java 8-compatible; 21 is the level it asks for,
|
|
// not one it needs. So the level is lowered to 17 for this one subproject.
|
|
//
|
|
// Deliberately scoped by name rather than applied to every subproject: a blanket
|
|
// override would silently change the bytecode target of ~20 unrelated plugins
|
|
// that build fine today, to fix one that does not.
|
|
//
|
|
// The real fix is a JDK 21 toolchain (`flutter config --jdk-dir=...`). When this
|
|
// machine and CI both have one, delete this block and let the plugin have the
|
|
// level it asked for.
|
|
// Both halves must move together: Kotlin and Java have to agree on a JVM target
|
|
// or the Kotlin plugin fails the build itself ("Inconsistent JVM-target
|
|
// compatibility"). Setting only the JavaCompile tasks is not enough either —
|
|
// AGP writes `compileOptions` from the library extension after this file is
|
|
// evaluated, so the override has to happen in `afterEvaluate` to land last.
|
|
subprojects {
|
|
if (name == "maplibre_gl") {
|
|
afterEvaluate {
|
|
extensions.findByName("android")?.let { ext ->
|
|
ext.withGroovyBuilder {
|
|
"compileOptions" {
|
|
setProperty("sourceCompatibility", JavaVersion.VERSION_17)
|
|
setProperty("targetCompatibility", JavaVersion.VERSION_17)
|
|
}
|
|
}
|
|
}
|
|
tasks.withType<JavaCompile>().configureEach {
|
|
sourceCompatibility = JavaVersion.VERSION_17.toString()
|
|
targetCompatibility = JavaVersion.VERSION_17.toString()
|
|
}
|
|
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>()
|
|
.configureEach {
|
|
compilerOptions.jvmTarget.set(
|
|
org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17,
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
tasks.register<Delete>("clean") {
|
|
delete(rootProject.layout.buildDirectory)
|
|
}
|