From a1d60ba3bd254679fa8dc0563a608bdb9d4e650d Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Jun 2026 07:28:03 +0000 Subject: [PATCH 1/4] Upgrade Compose BOM to 2025.05.01 (Compose 1.8.x) (v0.21.3-beta.1) Bumps composeBom from 2024.12.01 to 2025.05.01, bringing Compose UI 1.8.x and Material3 1.4.x. No user-visible changes. https://claude.ai/code/session_01AGmvoYfqqkLA9SUWV6myXW --- CHANGELOG.md | 5 +++++ app/build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 922facb..ffc467a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,11 @@ Rules: --- +## [0.21.3-beta.1] - 2026-06-02 + +### Changed +- Compose BOM upgraded from `2024.12.01` to `2025.05.01` (Compose UI 1.8.x, Material3 1.4.x). No user-visible changes; enables use of stable Compose 1.8 APIs internally. + ## [0.21.2-beta.1] - 2026-06-02 ### Changed diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 92cd438..9480cbc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,8 +13,8 @@ android { applicationId = "com.mapgie.goflo" minSdk = 26 targetSdk = 34 - versionCode = 57 - versionName = "0.21.2-beta.1" + versionCode = 58 + versionName = "0.21.3-beta.1" } signingConfigs { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 74e8fc6..dbc3ec7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ ksp = "2.0.0-1.0.21" coreKtx = "1.13.1" lifecycleRuntime = "2.8.1" activityCompose = "1.9.0" -composeBom = "2024.12.01" +composeBom = "2025.05.01" navigationCompose = "2.7.7" room = "2.6.1" datastorePreferences = "1.1.1" From 0ce39131182a5479f3d4e2437668284bbfdcf46e Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Jun 2026 08:15:37 +0000 Subject: [PATCH 2/4] Fix Compose 1.8 build: bump AGP to 8.6.0 and compileSdk to 35 Compose 1.8.2 requires compileSdk >= 35. AGP 8.4.0 caps recommended compileSdk at 34, so both need to be bumped together. targetSdk stays at 34 to avoid behavioural changes for users. https://claude.ai/code/session_01AGmvoYfqqkLA9SUWV6myXW --- app/build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9480cbc..3784b63 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,7 +7,7 @@ plugins { android { namespace = "com.mapgie.goflo" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.mapgie.goflo" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dbc3ec7..2c6e52b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.4.0" +agp = "8.6.0" kotlin = "2.0.0" ksp = "2.0.0-1.0.21" coreKtx = "1.13.1" From 7000a67637fb6ce7c38460bc422f0922b813d653 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Jun 2026 08:27:37 +0000 Subject: [PATCH 3/4] Bump Gradle wrapper to 8.7; note BOM version in Licences screen AGP 8.6.0 requires Gradle 8.7 as its minimum. Updated the wrapper distributionUrl from 8.6 to 8.7. Added a one-line comment to LicensesScreen noting the active Compose BOM version so the file stays in sync with libs.versions.toml changes. https://claude.ai/code/session_01AGmvoYfqqkLA9SUWV6myXW --- .../java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt b/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt index d180353..afcfee9 100644 --- a/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt +++ b/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt @@ -2,6 +2,7 @@ package com.mapgie.goflo.ui.screens.licenses // MAINTAINER NOTE: keep this list in sync with gradle/libs.versions.toml. // Add an entry here whenever a new RUNTIME dependency is added to the project. +// Compose library versions are pinned via the Compose BOM (currently 2025.05.01). // // Excluded — not shipped in the release APK: // junit (testImplementation only) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..e7646de 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From b15f52dc64dcf7b78d984637dcf565421a91fd31 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Jun 2026 08:32:22 +0000 Subject: [PATCH 4/4] Bump CI Gradle version from 8.6 to 8.7 AGP 8.6.0 requires Gradle 8.7 as its minimum. The workflow files were pinning Gradle explicitly, overriding the wrapper, so the wrapper change alone was not enough. https://claude.ai/code/session_01AGmvoYfqqkLA9SUWV6myXW --- .github/workflows/build.yml | 4 ++-- .github/workflows/codeql.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a8fb99d..29b3bb2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,10 +29,10 @@ jobs: java-version: '17' distribution: 'temurin' - - name: Setup Gradle 8.6 + - name: Setup Gradle 8.7 uses: gradle/actions/setup-gradle@v3 with: - gradle-version: '8.6' + gradle-version: '8.7' cache-read-only: false - name: Write local.properties diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2df5fbd..c67e615 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -39,10 +39,10 @@ jobs: java-version: "17" distribution: temurin - - name: Setup Gradle 8.6 + - name: Setup Gradle 8.7 uses: gradle/actions/setup-gradle@v3 with: - gradle-version: "8.6" + gradle-version: "8.7" cache-read-only: false - name: Write local.properties