Merge pull request #123 from devinbileck/support-latest-api-level

Support API level 36

Author: devinbileck

.github/actions/get-avd-info/action.yml

@@ -16,11 +16,22 @@ runs:
     steps:
         # Prefer ATD system images available in API 30+ as they are optimized for headless tests.
         # Google Play services is required and is available in the google_atd and google_apis images.
-        # Note, API 27 does not provide a google_apis system image.
+        # Note:
+        #  - API 27 does not provide a google_apis system image.
+        #  - Newer API's may not yet provide an ATD system image.
         -   id: get-avd-target
-            run: echo "target=$(if [ ${{ inputs.api-level }} -eq 27 ]; then echo default; elif [ ${{ inputs.api-level }} -ge 30 ]; then echo google_atd; else echo google_apis; fi)" >> $GITHUB_OUTPUT
             shell: bash
+            run: |
+                set -euo pipefail
+                api="${{ inputs.api-level }}"
+                target="google_apis"
+                if [[ "$api" -eq 27 ]]; then
+                    target="default"
+                elif [[ "$api" -ge 30 ]] && sdkmanager --list | grep -q "system-images;android-$api;google_atd;"; then
+                    target="google_atd"
+                fi
+                echo "target=$target" >> "$GITHUB_OUTPUT"
         # Prefer x86_64 architecture
         -   id: get-avd-arch
-            run: echo "arch=x86_64" >> $GITHUB_OUTPUT
             shell: bash
+            run: echo "arch=x86_64" >> $GITHUB_OUTPUT

.github/dependabot.yml

@@ -4,3 +4,7 @@ updates:
         directory: "/"
         schedule:
             interval: "monthly"
+    -   package-ecosystem: "gradle"
+        directory: "/"
+        schedule:
+            interval: "monthly"

.github/workflows/ci.yaml

@@ -10,7 +10,6 @@ on:
 jobs:
     analyze:
         name: Analyze
-        if: ${{ github.actor != 'dependabot[bot]' }}
         runs-on: ubuntu-latest
         timeout-minutes: 10
         steps:
@@ -36,9 +35,6 @@ jobs:
                         ~/.gradle/wrapper
                     key: ${{ runner.os }}-gradle-${{ env.CACHE_VERSION }}-${{ hashFiles('**/**.gradle.kts', '**/gradle/wrapper/gradle-wrapper.properties', '**/libs.versions.toml') }}
 
-            -   name: Check Gradle wrapper
-                uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6
-
             -   name: Check code style
                 run: ./gradlew ktlintCheck
 
@@ -95,9 +91,6 @@ jobs:
                         ~/.gradle/wrapper
                     key: ${{ runner.os }}-gradle-${{ env.CACHE_VERSION }}-${{ hashFiles('**/**.gradle.kts', '**/gradle/wrapper/gradle-wrapper.properties', '**/libs.versions.toml') }}
 
-            -   name: Check Gradle wrapper
-                uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6
-
             # TODO: Add code coverage metrics
             # See https://about.codecov.io/blog/code-coverage-for-android-development-using-kotlin-jacoco-github-actions-and-codecov/
             -   name: Run unit tests
@@ -113,12 +106,12 @@ jobs:
     instrumentation-tests:
         name: Instrumentation tests on API ${{ matrix.api-level }}
         runs-on: ubuntu-latest
-        timeout-minutes: 15
+        timeout-minutes: 30
         needs: unit-tests
         strategy:
             fail-fast: false
             matrix:
-                api-level: [ 26, 27, 28, 29, 30, 31, 32, 33, 34 ]
+                api-level: [ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36 ]
         steps:
             -   name: Checkout the code
                 uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -142,9 +135,6 @@ jobs:
                         ~/.gradle/wrapper
                     key: ${{ runner.os }}-gradle-${{ env.CACHE_VERSION }}-${{ hashFiles('**/**.gradle.kts', '**/gradle/wrapper/gradle-wrapper.properties', '**/libs.versions.toml') }}
 
-            -   name: Check Gradle wrapper
-                uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6
-
             -   name: Enable KVM
                 run: |
                     echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
@@ -160,30 +150,6 @@ jobs:
                 with:
                     api-level: ${{ matrix.api-level }}
 
-            # Retrieve the cached emulator snapshot
-            -   name: Retrieve cached emulator snapshot
-                uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
-                id: avd-cache
-                with:
-                    path: |
-                        ~/.android/avd/*
-                        ~/.android/adb*
-                    key: ${{ runner.os }}-avd-${{ env.CACHE_VERSION }}-${{ steps.avd-info.outputs.arch }}-${{ steps.avd-info.outputs.target }}-${{ matrix.api-level }}
-
-            # Create a new emulator snapshot if it isn't present in the cache
-            -   name: Create AVD snapshot
-                if: steps.avd-cache.outputs.cache-hit != 'true'
-                uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed
-                with:
-                    api-level: ${{ matrix.api-level }}
-                    target: ${{ steps.avd-info.outputs.target }}
-                    arch: ${{ steps.avd-info.outputs.arch }}
-                    disable-animations: true
-                    force-avd-creation: false
-                    ram-size: 4096M
-                    emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-                    script: echo "Generated AVD snapshot"
-
             -   name: Run instrumentation tests
                 uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed
                 with:
@@ -193,8 +159,19 @@ jobs:
                     disable-animations: true
                     force-avd-creation: false
                     ram-size: 4096M
-                    emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-                    script: ./gradlew connectedCheck && killall -INT crashpad_handler || true
+                    emulator-options: >-
+                        -no-snapshot -wipe-data
+                        -no-window -gpu swiftshader_indirect -noaudio
+                        -no-boot-anim -camera-back none -camera-front none
+                    script: |
+                        adb shell settings put global window_animation_scale 0
+                        adb shell settings put global transition_animation_scale 0
+                        adb shell settings put global animator_duration_scale 0
+                        adb shell cmd package bg-dexopt-job || true
+                        ./gradlew connectedCheck
+                        RC=$?
+                        killall -INT crashpad_handler || true
+                        exit $RC
 
             -   name: Upload reports
                 uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08

.github/workflows/master.yaml

@@ -10,7 +10,6 @@ on:
 jobs:
     build:
         name: Build
-        if: ${{ github.actor != 'dependabot[bot]' }}
         runs-on: ubuntu-latest
         timeout-minutes: 10
         outputs:
@@ -53,9 +52,6 @@ jobs:
                         ~/.gradle/wrapper
                     key: ${{ runner.os }}-gradle-${{ env.CACHE_VERSION }}-${{ hashFiles('**/**.gradle.kts', '**/gradle/wrapper/gradle-wrapper.properties', '**/libs.versions.toml') }}
 
-            -   name: Check Gradle wrapper
-                uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6
-
             -   name: Build the app
                 run: ./gradlew assembleRelease bundleRelease
 
@@ -69,15 +65,15 @@ jobs:
             -   name: Upload unsigned APK
                 uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
                 with:
-                    name: bisq-release.apk
-                    path: app/build/outputs/apk/release/bisq-release.apk
+                    name: bisq-notifications-release.apk
+                    path: app/build/outputs/apk/release/bisq-notifications-release.apk
                     if-no-files-found: error
 
             -   name: Upload unsigned AAB
                 uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
                 with:
-                    name: bisq-release.aab
-                    path: app/build/outputs/bundle/release/bisq-release.aab
+                    name: bisq-notifications-release.aab
+                    path: app/build/outputs/bundle/release/bisq-notifications-release.aab
                     if-no-files-found: error
 
     sign:
@@ -89,13 +85,13 @@ jobs:
             -   name: Download unsigned APK
                 uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
                 with:
-                    name: bisq-release.apk
+                    name: bisq-notifications-release.apk
                     path: app/build/outputs/apk/release
 
             -   name: Download unsigned AAB
                 uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
                 with:
-                    name: bisq-release.aab
+                    name: bisq-notifications-release.aab
                     path: app/build/outputs/bundle/release
 
             -   name: Determine latest build-tools version
@@ -132,17 +128,19 @@ jobs:
             -   name: Upload signed APK
                 uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
                 with:
-                    name: bisq-release-signed.apk
+                    name: bisq-notifications-release-signed.apk
                     path: ${{ steps.sign_apk.outputs.signedReleaseFile }}
 
             -   name: Upload signed AAB
                 uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
                 with:
-                    name: bisq-release-signed.aab
+                    name: bisq-notifications-release-signed.aab
                     path: ${{ steps.sign_aab.outputs.signedReleaseFile }}
 
     upload_to_firebase:
         name: Upload to Firebase
+        # Is this job necessary? Temporarily disable it for now
+        if: false
         runs-on: ubuntu-latest
         timeout-minutes: 10
         needs: [ build, sign ]
@@ -153,25 +151,25 @@ jobs:
             -   name: Download signed APK
                 uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
                 with:
-                    name: bisq-release-signed.apk
+                    name: bisq-notifications-release-signed.apk
                     path: app/build/outputs/apk/release
 
             -   name: Download signed AAB
                 uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
                 with:
-                    name: bisq-release-signed.aab
+                    name: bisq-notifications-release-signed.aab
                     path: app/build/outputs/bundle/release
 
             -   name: Upload signed APK to Firebase App Distribution
                 uses: wzieba/Firebase-Distribution-Github-Action@bd494989dd4bec0343f78adee87fe66e48279ad6
                 with:
                     appId: ${{ secrets.FIREBASE_APP_ID }}
                     serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
-                    file: app/build/outputs/apk/release/bisq-release-signed.apk
+                    file: app/build/outputs/apk/release/bisq-notifications-release-signed.apk
 
             -   name: Upload signed AAB to Firebase App Distribution
                 uses: wzieba/Firebase-Distribution-Github-Action@bd494989dd4bec0343f78adee87fe66e48279ad6
                 with:
                     appId: ${{ secrets.FIREBASE_APP_ID }}
                     serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
-                    file: app/build/outputs/bundle/release/bisq-release.aab
+                    file: app/build/outputs/bundle/release/bisq-notifications-release.aab

.github/workflows/release.yaml

@@ -39,6 +39,6 @@ jobs:
                     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                 with:
                     upload_url: ${{ steps.create_release.outputs.upload_url }}
-                    asset_path: ./bisq-release-signed.apk
-                    asset_name: bisq-release-signed.apk
+                    asset_path: ./bisq-notifications-release-signed.apk
+                    asset_name: bisq-notifications-release-signed.apk
                     asset_content_type: application/zip

.gitignore

@@ -1,5 +1,6 @@
 .gradle/
 .idea/
+*.iml
 app/build/
 app/release/
 app/google-services.json

README.md

@@ -14,23 +14,6 @@ for more information.
 > Note, the `google-services.json` file needs to correspond to the `fcmServiceAccountKey.json`
 > used by the [bisq-relay](https://github.com/bisq-network/bisq-relay) service.
 
-## Updating Dependencies
-
-Whenever dependencies are updated/changed, it is necessary to update the following:
-
-- [gradle/verification-metadata.xml](gradle/verification-metadata.xml) - can be updated using the
-  following command:
-
-```shell
-./gradlew --write-verification-metadata sha256 build :app:processDebugResources :app:connectedDebugAndroidTest
-```
-
-- [gradle.lockfile](gradle.lockfile) - can be updated using the following command:
-
-```shell
-./gradlew dependencies --write-locks
-```
-
 ## Architectural Design
 
 For information on the architectural design, refer to the