From 156450da78ae66bd1dcaf89afda04149484a8960 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 21 Mar 2025 12:20:19 +0100 Subject: [PATCH 1/3] Revert AGP to 8.8.1. There is an issue when building the release version of the app. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 670ae1cb21..8be2a2dac6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ [versions] # Project -android_gradle_plugin = "8.9.0" +android_gradle_plugin = "8.8.1" kotlin = "2.1.10" kotlinpoet = "2.1.0" ksp = "2.1.10-1.0.31" From a0105c3bd2d4eef0dfc16359814d1cbb2e38700f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 21 Mar 2025 12:33:03 +0100 Subject: [PATCH 2/3] Ensure that release and nightly can be bundled. --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3532ee8ebd..fc27f8ef4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,7 +89,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Compile release sources if: ${{ matrix.variant == 'release' }} - run: ./gradlew compileReleaseSources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES + run: ./gradlew bundleGplayRelease -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES - name: Compile nightly sources if: ${{ matrix.variant == 'nightly' }} - run: ./gradlew compileGplayNightlySources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES + run: ./gradlew bundleGplayNightly -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES From 00e46456b73ba684181c8fda9dbebe864f677c43 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 21 Mar 2025 12:49:40 +0100 Subject: [PATCH 3/3] Just compile the nightly source. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc27f8ef4c..20b212ca38 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,4 +92,4 @@ jobs: run: ./gradlew bundleGplayRelease -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES - name: Compile nightly sources if: ${{ matrix.variant == 'nightly' }} - run: ./gradlew bundleGplayNightly -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES + run: ./gradlew compileGplayNightlySources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES