From 27cdf52914228ad92778779f3b3af3a0ec19b126 Mon Sep 17 00:00:00 2001
From: DX <danyalghlaby@gmail.com>
Date: Sun, 11 Feb 2024 14:33:11 +0330
Subject: [PATCH 1/3] change java distribution

---
 .github/workflows/releaseTest.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/releaseTest.yaml b/.github/workflows/releaseTest.yaml
index 2c2a65df..57cd156a 100644
--- a/.github/workflows/releaseTest.yaml
+++ b/.github/workflows/releaseTest.yaml
@@ -49,7 +49,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '17'
-          distribution: 'zulu'
+          distribution: 'microsoft'
           cache: 'gradle'
 
       - name: Install NDK

From a58abaead6f7a5b49fa0ba7078e65a324ae89e96 Mon Sep 17 00:00:00 2001
From: DanielcoderX <danyalghlaby@gmail.com>
Date: Sun, 11 Feb 2024 14:40:16 +0330
Subject: [PATCH 2/3] separate go/gradle build

---
 .github/workflows/releaseTest.yaml | 74 +++++++++++++++++-------------
 1 file changed, 43 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/releaseTest.yaml b/.github/workflows/releaseTest.yaml
index 57cd156a..bf9146fe 100644
--- a/.github/workflows/releaseTest.yaml
+++ b/.github/workflows/releaseTest.yaml
@@ -6,7 +6,7 @@ on:
     types: [ published ]
 
 jobs:
-  build:
+  go-build:
 
     permissions:
       contents: write
@@ -77,43 +77,55 @@ jobs:
           GOPROXY: https://proxy.golang.org,direct
           GO111MODULE: "on"
 
-      - name: Change wrapper permissions
-        run: chmod +x ./gradlew
+        uses: softprops/action-gh-release@v1
+        with:
+          files: app-release-signed.apk
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  android-build-and-release:
+    needs: go-build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout codebase
+        uses: actions/checkout@v3
 
-      # Run Build Project
-      - name: Build gradle project
-        run: ./gradlew build
+      - name: Set Up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'microsoft'
+          cache: 'gradle'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
 
-      # Build APKs
       - name: Build Release APK
         run: ./gradlew assembleRelease
 
-      # Signing steps
-      - name: Decode signing keystore
-        run: |
-          echo "${{ secrets.SIGNING_KEY }}" > signing_key_store.jks
-          echo "${{ secrets.KEY_STORE_PASSWORD }}" > keystore_password.txt
-  
-      - name: Sign the APK
+      - name: Sign APK
         run: |
-          keytool -list -keystore signing_key_store.jks -alias "${{ secrets.ALIAS }}" -storepass "$(cat keystore_password.txt)"
-          jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA256 -keystore signing_key_store.jks -storepass "$(cat keystore_password.txt)" -keypass "${{ secrets.KEY_PASSWORD }}" -signedjar app-release-signed.apk app-release.apk "${{ secrets.ALIAS }}"
-  
-      - name: Clean up temporary files
-        run: |
-          rm signing_key_store.jks keystore_password.txt
-  
-      # Update upload step to use signed APK
-      - name: Upload files to Artifacts
-        uses: actions/upload-artifact@v3
+          echo "${{ secrets.SIGNING_KEY }}" | base64 --decode > my-release-key.keystore
+          ./gradlew signReleaseBundle \
+            --no-daemon \
+            -Pandroid.injected.signing.store.file=my-release-key.keystore \
+            -Pandroid.injected.signing.store.password=${{ secrets.KEY_STORE_PASSWORD }} \
+            -Pandroid.injected.signing.key.alias=${{ secrets.ALIAS }} \
+            -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }}
+        env:
+          KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          ALIAS: ${{ secrets.ALIAS }}
+
+      - name: Upload Signed APK to Artifacts
+        uses: actions/upload-artifact@v2
         with:
-          name: app-release.apk
-          path: app-release-signed.apk
-  
-      # Update release step to use signed APK
-      - name: Release with Notes
+          name: Signed APK
+          path: app/build/outputs/apk/release/app-release.apk
+
+      - name: Release APK
+        if: github.event_name == 'release' && github.event.action == 'published'
         uses: softprops/action-gh-release@v1
         with:
-          files: app-release-signed.apk
+          files: app/build/outputs/apk/release/app-release.apk
         env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 3930a5173383f2483bae5aaa93a1dda5255aa869 Mon Sep 17 00:00:00 2001
From: DanielcoderX <danyalghlaby@gmail.com>
Date: Sun, 11 Feb 2024 14:42:31 +0330
Subject: [PATCH 3/3] separate go/gradle build

---
 .github/workflows/releaseTest.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/releaseTest.yaml b/.github/workflows/releaseTest.yaml
index bf9146fe..3ab1be82 100644
--- a/.github/workflows/releaseTest.yaml
+++ b/.github/workflows/releaseTest.yaml
@@ -77,11 +77,6 @@ jobs:
           GOPROXY: https://proxy.golang.org,direct
           GO111MODULE: "on"
 
-        uses: softprops/action-gh-release@v1
-        with:
-          files: app-release-signed.apk
-        env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   android-build-and-release:
     needs: go-build
     runs-on: ubuntu-latest