Merge branch 'hotfix/1.2.9'

Author: mshdabiola

.github/workflows/deploy_foss_to_github.yml

@@ -5,48 +5,44 @@ on:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
 
+## 2
 jobs:
+  ## 3
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 120
-
     steps:
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-          ls /dev/kvm
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
-      - name: Copy CI gradle.properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      # 1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: '17'
+      # 2
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
 
       - name: Accept Android licenses
         run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+          build-scan-terms-of-use-agree: "yes"
+
       - name: Remove Firebase References
         run: |
           sed -i -e '/androidx.dev/d' settings.gradle.kts
           sed -i -e '/with(target) {/,/^        }/d' -e '/CrashlyticsExtension/d' build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
           sed -i -e '/libs.firebase/d' build-logic/convention/build.gradle.kts
 
-      - name: Build release variant apk
-        run: ./gradlew :app:assembleFossReliantRelease
+      - name: Generate Release APK
+        run: ./gradlew assembleFossReliantRelease
 
       - name: Sign APK
-        uses: r0adkll/sign-android-release@v1.0.4
+        uses: r0adkll/sign-android-release@v1
         with:
           releaseDirectory: app/build/outputs/apk/fossReliant/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
@@ -56,6 +52,7 @@ jobs:
         env:
           BUILD_TOOLS_VERSION: "34.0.0"
 
+      # 4
       - name: Draft Release
         uses: ncipollo/release-action@v1.14.0
         with:
@@ -65,4 +62,3 @@ jobs:
           generateReleaseNotes: true
           bodyFile: distribution/whatsnew/whatsnew-en-US
           prerelease: false
-

.github/workflows/deploy_play_to_github.yml

@@ -5,42 +5,38 @@ on:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
 
+## 2
 jobs:
+  ## 3
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 120
-
     steps:
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-          ls /dev/kvm
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
-      - name: Copy CI gradle.properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      # 1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: '17'
+      # 2
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
 
       - name: Accept Android licenses
         run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
 
-      - name: Build release variant apk
-        run: ./gradlew :app:assembleGooglePlayRelease
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+          build-scan-terms-of-use-agree: "yes"
+
+      - name: Generate Release APK
+        run: ./gradlew assembleGooglePlayRelease
 
       - name: Sign APK
-        uses: r0adkll/sign-android-release@v1.0.4
+        uses: r0adkll/sign-android-release@v1
         with:
           releaseDirectory: app/build/outputs/apk/googlePlay/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
@@ -50,6 +46,7 @@ jobs:
         env:
           BUILD_TOOLS_VERSION: "34.0.0"
 
+      # 4
       - name: Draft Release
         uses: ncipollo/release-action@v1.14.0
         with:
@@ -59,4 +56,3 @@ jobs:
           generateReleaseNotes: true
           bodyFile: distribution/whatsnew/whatsnew-en-US
           prerelease: false
-

gradle/libs.versions.toml

@@ -76,8 +76,8 @@ playServicesMlkitTextRecognition = "19.0.0"
 ktor = "2.3.11"
 uiTextGoogleFonts = "1.6.8"
 
-versionName = "1.2.7"
-versionCode = "127"
+versionName = "1.2.9"
+versionCode = "129"
 
 telephoto = "0.11.2"
 lottieCompose = "6.4.0"