From a3579ce0e0931e30f1c4fac06829ac1ccda3d4be Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 16 Oct 2024 07:57:11 -0300 Subject: [PATCH 1/6] create action to fix fdroid build --- .github/workflows/fix-fdroid-build.yml | 62 ++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .github/workflows/fix-fdroid-build.yml diff --git a/.github/workflows/fix-fdroid-build.yml b/.github/workflows/fix-fdroid-build.yml new file mode 100644 index 00000000..e28a8fc9 --- /dev/null +++ b/.github/workflows/fix-fdroid-build.yml @@ -0,0 +1,62 @@ +name: Create Release Assets + +on: + pull_request: + branches: [master] + push: + branches: [master] + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + ref: 'v2.0.6' + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + + - name: Cache gradle + uses: actions/cache@v4 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Build APK + run: ./gradlew assembleRelease --stacktrace + + - name: Sign free APK + uses: r0adkll/sign-android-release@v1 + with: + releaseDirectory: app/build/outputs/apk/free/release + signingKeyBase64: ${{ secrets.SIGNING_KEY }} + alias: ${{ secrets.KEY_ALIAS }} + keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} + keyPassword: ${{ secrets.KEY_PASSWORD }} + env: + # override default build-tools version (29.0.3) -- optional + BUILD_TOOLS_VERSION: "34.0.0" + + - uses: kaisugi/action-regex-match@v1.0.1 + id: regex-match + with: + text: ${{ github.ref }} + regex: '(v*-pre*)' + flags: gm + + - name: Upload Free APK Universal Asset + id: upload-free-release-asset-universal-apk + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: 'https://github.com/greenart7c3/Amber/releases/tag/v2.0.6' + asset_path: app/build/outputs/apk/free/release/app-free-universal-release-unsigned-signed.apk + asset_name: amber-fdroid-universal-${{ github.ref_name }}.apk + asset_content_type: application/zip From 9a95c4388d3592fc83cdfb48c8fc4fc26eb22e1d Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 16 Oct 2024 07:58:16 -0300 Subject: [PATCH 2/6] Test action --- .github/workflows/fix-fdroid-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/fix-fdroid-build.yml b/.github/workflows/fix-fdroid-build.yml index e28a8fc9..65ff28aa 100644 --- a/.github/workflows/fix-fdroid-build.yml +++ b/.github/workflows/fix-fdroid-build.yml @@ -60,3 +60,4 @@ jobs: asset_path: app/build/outputs/apk/free/release/app-free-universal-release-unsigned-signed.apk asset_name: amber-fdroid-universal-${{ github.ref_name }}.apk asset_content_type: application/zip + From db9d516145f9f66d60e8325097880dbf3098a8d5 Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 16 Oct 2024 07:59:41 -0300 Subject: [PATCH 3/6] Test action --- .github/workflows/fix-fdroid-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fix-fdroid-build.yml b/.github/workflows/fix-fdroid-build.yml index 65ff28aa..4353dc55 100644 --- a/.github/workflows/fix-fdroid-build.yml +++ b/.github/workflows/fix-fdroid-build.yml @@ -12,7 +12,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - ref: 'v2.0.6' + with: + ref: 'v2.0.6' - name: Set up JDK 17 uses: actions/setup-java@v4 From ad0a7dd07982484fbea5c14017ebae3750792936 Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 16 Oct 2024 08:09:59 -0300 Subject: [PATCH 4/6] Upload apk as artifact --- .github/workflows/fix-fdroid-build.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/fix-fdroid-build.yml b/.github/workflows/fix-fdroid-build.yml index 4353dc55..e9dc659a 100644 --- a/.github/workflows/fix-fdroid-build.yml +++ b/.github/workflows/fix-fdroid-build.yml @@ -51,14 +51,8 @@ jobs: regex: '(v*-pre*)' flags: gm - - name: Upload Free APK Universal Asset - id: upload-free-release-asset-universal-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: fdroid apk + uses: actions/upload-artifact@v4 with: - upload_url: 'https://github.com/greenart7c3/Amber/releases/tag/v2.0.6' - asset_path: app/build/outputs/apk/free/release/app-free-universal-release-unsigned-signed.apk - asset_name: amber-fdroid-universal-${{ github.ref_name }}.apk - asset_content_type: application/zip - + name: amber-fdroid-universal-${{ github.ref_name }}.apk + path: app/build/outputs/apk/free/release/app-free-universal-release-unsigned-signed.apk From b5393c373597222b4c070a1e6e6110483c21b9c9 Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 16 Oct 2024 08:54:36 -0300 Subject: [PATCH 5/6] Delete workflow --- .github/workflows/fix-fdroid-build.yml | 58 -------------------------- 1 file changed, 58 deletions(-) delete mode 100644 .github/workflows/fix-fdroid-build.yml diff --git a/.github/workflows/fix-fdroid-build.yml b/.github/workflows/fix-fdroid-build.yml deleted file mode 100644 index e9dc659a..00000000 --- a/.github/workflows/fix-fdroid-build.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: Create Release Assets - -on: - pull_request: - branches: [master] - push: - branches: [master] - -jobs: - deploy: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - ref: 'v2.0.6' - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - - - name: Cache gradle - uses: actions/cache@v4 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: Build APK - run: ./gradlew assembleRelease --stacktrace - - - name: Sign free APK - uses: r0adkll/sign-android-release@v1 - with: - releaseDirectory: app/build/outputs/apk/free/release - signingKeyBase64: ${{ secrets.SIGNING_KEY }} - alias: ${{ secrets.KEY_ALIAS }} - keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - # override default build-tools version (29.0.3) -- optional - BUILD_TOOLS_VERSION: "34.0.0" - - - uses: kaisugi/action-regex-match@v1.0.1 - id: regex-match - with: - text: ${{ github.ref }} - regex: '(v*-pre*)' - flags: gm - - - name: fdroid apk - uses: actions/upload-artifact@v4 - with: - name: amber-fdroid-universal-${{ github.ref_name }}.apk - path: app/build/outputs/apk/free/release/app-free-universal-release-unsigned-signed.apk From a6e0c7423d3147393797085bfa8759cb162d52dc Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 16 Oct 2024 09:11:43 -0300 Subject: [PATCH 6/6] update agp --- .idea/runConfigurations.xml | 4 ++++ gradle/libs.versions.toml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml index 931b96c3..16660f1d 100644 --- a/.idea/runConfigurations.xml +++ b/.idea/runConfigurations.xml @@ -5,8 +5,12 @@ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 138d6f63..0021fa1b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,7 +26,7 @@ zxingAndroidEmbedded = "4.3.0" okhttp = "5.0.0-alpha.14" kotlin = "2.0.20" workRuntimeKtx = "2.9.1" -agp = "8.7.0" +agp = "8.7.1" ktlint = "12.1.1" gms = "4.4.2" ksp = "2.0.20-1.0.24"