From 510a27d64f3c734c7fb26ed792a3f420326f336a Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Jun 2026 08:43:49 +0000 Subject: [PATCH 1/4] Upgrade Android Gradle Plugin to 8.13.2 and Gradle to 8.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - agp: 8.4.0 → 8.13.2 in libs.versions.toml - Gradle wrapper: 8.6 → 8.11.1 - CI workflows (build.yml, codeql.yml): pinned gradle-version updated to match - Version bump: 0.22.0-beta.1 → 0.22.1-beta.1 (versionCode 57 → 58) https://claude.ai/code/session_015nJL61uzWmbv1LttsFTDz2 --- .github/workflows/build.yml | 4 ++-- .github/workflows/codeql.yml | 4 ++-- CHANGELOG.md | 5 +++++ app/build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a8fb99d..0105824 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.11.1 uses: gradle/actions/setup-gradle@v3 with: - gradle-version: '8.6' + gradle-version: '8.11.1' cache-read-only: false - name: Write local.properties diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2df5fbd..5b94664 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.11.1 uses: gradle/actions/setup-gradle@v3 with: - gradle-version: "8.6" + gradle-version: "8.11.1" cache-read-only: false - name: Write local.properties diff --git a/CHANGELOG.md b/CHANGELOG.md index acb7160..d9c79c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,11 @@ Rules: --- +## [0.22.1-beta.1] - 2026-06-02 + +### Changed +- Upgraded Android Gradle Plugin from 8.4.0 to 8.13.2 and Gradle wrapper from 8.6 to 8.11.1. + ## [0.22.0-beta.1] - 2026-06-02 ### Added diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a260a6c..c15f092 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.22.0-beta.1" + versionCode = 58 + versionName = "0.22.1-beta.1" } signingConfigs { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 74e8fc6..db7f2c1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.4.0" +agp = "8.13.2" kotlin = "2.0.0" ksp = "2.0.0-1.0.21" coreKtx = "1.13.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..e2847c8 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.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From cd8378e71525111e7a7dc175582fe2f918abba7d Mon Sep 17 00:00:00 2001 From: mapgiedev <4250209+mapgie@users.noreply.github.com> Date: Tue, 2 Jun 2026 09:55:30 +0100 Subject: [PATCH 2/4] Update version code and name to 59 and 0.22.2-beta.1 --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a867d8b..f12fa02 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 = 58 - versionName = "0.22.1-beta.1" + versionCode = 59 + versionName = "0.22.2-beta.1" } signingConfigs { From 1edb6331a9d75bb0525a7f6f1f9aedd8571eb2bf Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Jun 2026 08:58:08 +0000 Subject: [PATCH 3/4] Verify LicensesScreen.kt in sync with libs.versions.toml after AGP bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AGP upgrade only — no runtime library additions or removals. Updating maintainer note to record the verification point. https://claude.ai/code/session_015nJL61uzWmbv1LttsFTDz2 --- .../java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt | 1 + 1 file changed, 1 insertion(+) 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 afcfee9..4f1070f 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 @@ -3,6 +3,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). +// Last verified against libs.versions.toml: AGP 8.13.2 upgrade (no library additions or removals). // // Excluded — not shipped in the release APK: // junit (testImplementation only) From c5a675eaebb2868c7d4eed8b51edd54fba60eb30 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Jun 2026 09:28:42 +0000 Subject: [PATCH 4/4] Fix Gradle version: bump to 8.13 (minimum required by AGP 8.13.2) AGP 8.13.2 requires Gradle >= 8.13; 8.11.1 was too old. Updates wrapper and both CI workflow pins. https://claude.ai/code/session_015nJL61uzWmbv1LttsFTDz2 --- .github/workflows/build.yml | 4 ++-- .github/workflows/codeql.yml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0105824..6d4756b 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.11.1 + - name: Setup Gradle 8.13 uses: gradle/actions/setup-gradle@v3 with: - gradle-version: '8.11.1' + gradle-version: '8.13' cache-read-only: false - name: Write local.properties diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 5b94664..a5586f7 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.11.1 + - name: Setup Gradle 8.13 uses: gradle/actions/setup-gradle@v3 with: - gradle-version: "8.11.1" + gradle-version: "8.13" cache-read-only: false - name: Write local.properties diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..37f853b 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.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME