From 2be2fa0f9edbee90e0f4329e5a6c6bf9180a7a6a Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Mon, 17 Aug 2026 01:50:54 +0900 Subject: [PATCH] Release 1.3.1 - Give BOM-managed Compose artifacts an explicit version so the published POM carries one (Maven Central rejects versionless dependencies, and consumers who do not import the Compose BOM cannot resolve them) - Fix the BOM module list: it pointed at a nonexistent geojson-layer coordinate and omitted seven modules, compose among them - Bump every submodule to its 1.3.1 release commit - Repair the standalone builds and add a per-PR build check to each module --- android-for-arcgis | 2 +- android-for-googlemaps | 2 +- android-for-here | 2 +- android-for-longdo | 2 +- android-for-mapbox | 2 +- android-for-maplibre | 2 +- android-for-mappls | 2 +- android-for-maptiler | 2 +- android-for-openmobilemaps | 2 +- android-for-tomtom | 2 +- android-geojson-layer | 2 +- android-heatmap | 2 +- android-icons | 2 +- android-kml | 2 +- android-marker-clustering | 2 +- android-sdk-compose | 2 +- android-sdk-core | 2 +- gradle.properties | 2 +- gradle/libs.versions.toml | 27 ++++++++++++++------------- mapconductor-bom | 2 +- 20 files changed, 33 insertions(+), 32 deletions(-) diff --git a/android-for-arcgis b/android-for-arcgis index 195d5ed7..6250c2cd 160000 --- a/android-for-arcgis +++ b/android-for-arcgis @@ -1 +1 @@ -Subproject commit 195d5ed78fdf031659f56b83388873b679a9a69e +Subproject commit 6250c2cd315b9baf3d8f01fce4dd32408595b3ff diff --git a/android-for-googlemaps b/android-for-googlemaps index 5ccf17ab..4b0d9c5f 160000 --- a/android-for-googlemaps +++ b/android-for-googlemaps @@ -1 +1 @@ -Subproject commit 5ccf17ab2c718002ef7f8f641c98f6f8a85c042f +Subproject commit 4b0d9c5fe58288004837f28a39547c632f234921 diff --git a/android-for-here b/android-for-here index 4a4f24f1..1aa3fde0 160000 --- a/android-for-here +++ b/android-for-here @@ -1 +1 @@ -Subproject commit 4a4f24f1cc6475b94aa54e1c6fc72f1c613d68a6 +Subproject commit 1aa3fde06b5464b29b1143374d11ba218a01fd2a diff --git a/android-for-longdo b/android-for-longdo index 5b7be301..c3f27e01 160000 --- a/android-for-longdo +++ b/android-for-longdo @@ -1 +1 @@ -Subproject commit 5b7be301e707d8fc84835fe2bd39fef700abb759 +Subproject commit c3f27e0192077cec62b8b8510adbdd14b6618b57 diff --git a/android-for-mapbox b/android-for-mapbox index 63d19374..87559752 160000 --- a/android-for-mapbox +++ b/android-for-mapbox @@ -1 +1 @@ -Subproject commit 63d19374498cf4810a45fb61e3f76bb8ecbce0d8 +Subproject commit 87559752187075cab21c300ffe013120b70788dd diff --git a/android-for-maplibre b/android-for-maplibre index 58db0dd7..2a51884f 160000 --- a/android-for-maplibre +++ b/android-for-maplibre @@ -1 +1 @@ -Subproject commit 58db0dd7fb9b35eb422e6a3d8c4ee0bcb1c93b5e +Subproject commit 2a51884f87b9b8e90af2ada8dde19f12d3a0f337 diff --git a/android-for-mappls b/android-for-mappls index 6bc026af..e3d99cea 160000 --- a/android-for-mappls +++ b/android-for-mappls @@ -1 +1 @@ -Subproject commit 6bc026af1985e379ef1d54cca3997e36cc9e959e +Subproject commit e3d99cea575281a4c2a3ed8d866dcfe9f075ddef diff --git a/android-for-maptiler b/android-for-maptiler index 0c14e264..8f5d5de0 160000 --- a/android-for-maptiler +++ b/android-for-maptiler @@ -1 +1 @@ -Subproject commit 0c14e2648c6025ca6eff94abc2fac6a823a525dd +Subproject commit 8f5d5de0d017a827ea1b9ad32ce0dbd506da8f06 diff --git a/android-for-openmobilemaps b/android-for-openmobilemaps index 83b738ca..b782f18b 160000 --- a/android-for-openmobilemaps +++ b/android-for-openmobilemaps @@ -1 +1 @@ -Subproject commit 83b738cafec719961e26c49f12529b5954f0911b +Subproject commit b782f18b70550bb5da114dffb8745e62a5dc1ab5 diff --git a/android-for-tomtom b/android-for-tomtom index 7552cecd..5cf564f1 160000 --- a/android-for-tomtom +++ b/android-for-tomtom @@ -1 +1 @@ -Subproject commit 7552cecde1da358777b2eb7d93198a4740cb85d5 +Subproject commit 5cf564f10b5431fb1b2bcdfd70a53024652bec72 diff --git a/android-geojson-layer b/android-geojson-layer index 1c2fbf07..66b5855f 160000 --- a/android-geojson-layer +++ b/android-geojson-layer @@ -1 +1 @@ -Subproject commit 1c2fbf07db2e63372df7f31c72404dd3c7d08878 +Subproject commit 66b5855f36cc5f8e7c359c3426dd4029d258c3fa diff --git a/android-heatmap b/android-heatmap index d660d441..d647d5e2 160000 --- a/android-heatmap +++ b/android-heatmap @@ -1 +1 @@ -Subproject commit d660d441a8f51101ef4e04a6c5b823f53ebe0acc +Subproject commit d647d5e2327f9a42c89079be844672c402f5cf0c diff --git a/android-icons b/android-icons index d1fdb0d9..0afc2012 160000 --- a/android-icons +++ b/android-icons @@ -1 +1 @@ -Subproject commit d1fdb0d9a8a4217e73e5263060543bc0d42df1a2 +Subproject commit 0afc20126fb918283b322dca34cb6201840e9720 diff --git a/android-kml b/android-kml index d712d28b..b02b42a4 160000 --- a/android-kml +++ b/android-kml @@ -1 +1 @@ -Subproject commit d712d28b191fdbfc966ec9eedcfa8acc6f18e4c0 +Subproject commit b02b42a4eb91c5e8a130dc58c2c9cf539bb17802 diff --git a/android-marker-clustering b/android-marker-clustering index 2d4d4695..7ae4aa6a 160000 --- a/android-marker-clustering +++ b/android-marker-clustering @@ -1 +1 @@ -Subproject commit 2d4d469561151b48eae5deaae685730a31269d2b +Subproject commit 7ae4aa6ae80f13186cf22344d602b6c9b050ff27 diff --git a/android-sdk-compose b/android-sdk-compose index 7956ccb2..10537ebb 160000 --- a/android-sdk-compose +++ b/android-sdk-compose @@ -1 +1 @@ -Subproject commit 7956ccb2b2a4ed567a4def11a22a3bfa90062ce3 +Subproject commit 10537ebb006b51211f315c92021b310e40fbd269 diff --git a/android-sdk-core b/android-sdk-core index ad8cad82..760b8432 160000 --- a/android-sdk-core +++ b/android-sdk-core @@ -1 +1 @@ -Subproject commit ad8cad829387c7f6ad2fdd82350e038eb966cd39 +Subproject commit 760b8432bd6914075ac27ccc6c1cf303a59bde43 diff --git a/gradle.properties b/gradle.properties index b119fa1b..32e6f48c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ kotlin.code.style=official android.nonTransitiveRClass=true compileSdk=37 targetSdk=35 -minSdk=26 +minSdk=28 versionCode=1 versionName=1.0.0 javaVersion=17 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9adaee62..4c9e5448 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,5 @@ [versions] +composeLibs = "1.7.8" openmobilemaps = "4.0.0" agp = "9.2.1" @@ -46,7 +47,7 @@ androidx-core = { module = "androidx.test:core", version.ref = "core" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } androidx-runner = { module = "androidx.test:runner", version.ref = "runner" } -androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "composeLibs" } androidx-material-icons-core = { group = "androidx.compose.material", name = "material-icons-core" } androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } @@ -58,13 +59,13 @@ androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "l # Jetpack Compose?with BOM? 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-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } -androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } -androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } -androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "composeLibs" } +androidx-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeLibs" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics", version.ref = "composeLibs" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "composeLibs" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "composeLibs" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "composeLibs" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "composeLibs" } mapconductor-core = { module = "com.mapconductor:core" } mapconductor-icons = { module = "com.mapconductor:icons" } @@ -115,13 +116,13 @@ androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "j androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } androidx-vectordrawable = { group = "androidx.vectordrawable", name = "vectordrawable", version.ref = "vectordrawable" } -androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" } -androidx-runtime = { group = "androidx.compose.runtime", name = "runtime" } +androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "composeLibs" } +androidx-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "composeLibs" } material = { group = "com.google.android.material", name = "material", version.ref = "materialVersion" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } -androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } -androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" } -androidx-compose-ui-unit = { group = "androidx.compose.ui", name = "ui-unit" } +androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics", version.ref = "composeLibs" } +androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeLibs" } +androidx-compose-ui-unit = { group = "androidx.compose.ui", name = "ui-unit", version.ref = "composeLibs" } androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "ui" } [plugins] diff --git a/mapconductor-bom b/mapconductor-bom index b06fa1c0..51705573 160000 --- a/mapconductor-bom +++ b/mapconductor-bom @@ -1 +1 @@ -Subproject commit b06fa1c057480b356feee7ea1e310e7c4ca6b794 +Subproject commit 517055737cfe732be73bb10d2882deef3fb5ff47