From 093f778f1ce4db29f7d2cd693af62e5257dc0c2d Mon Sep 17 00:00:00 2001
From: Ujwal Akotkar <24bcs012@iiitdwd.ac.in>
Date: Mon, 27 Oct 2025 20:50:37 +0530
Subject: [PATCH 01/10] fix(deps): Added automatic Google play deployment'

Signed-off-by: Ujwal Akotkar <24bcs012@iiitdwd.ac.in>
---
 .github/workflows/build_and_deploy.yml | 139 +++++++++++++++----------
 1 file changed, 85 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index f35a8a91..f7543583 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -1,82 +1,113 @@
-name: Build and Deploy
+# Github Actions CI workflow to deploy to Internal testing in the Play Store
+name: CI_STORE_DEPLOY_ANDROID
 
 on:
+  # Run this workflow when any new code is pushed into the main branch
   push:
     branches:
+      - main
       - master
-  pull_request:
-    types: [closed]
-    branches:
-      - master
-  workflow_dispatch:
+      - deploy-actions
 
 jobs:
-  build:
+  store_deploy_android:
+    name: android store release
     runs-on: ubuntu-latest
-
+    env:
+      # Setup env variables that will be used throughout the workflow
+      # Changed to Java 17 for better Gradle compatibility
+      JAVA_VERSION: 17
+      FLUTTER_VERSION: 3.35.2
+      AAB_PATH: build/app/outputs/bundle/release/app-release.aab
+      KEYSTORE_PATH: android/upload-keystore.jks
+      KEY_PROPS_PATH: android/key.properties
+      # Added paths for Play Store and Firebase secrets
+      SERVICE_ACCOUNT_PATH: store_credentials.json
+      FIREBASE_OPTIONS_PATH: lib/firebase_options.dart
+      GOOGLE_SERVICES_ANDROID_PATH: android/app/google-services.json
+      APPWRITE_PROJECT_ID: ${{ secrets.APPWRITE_PROJECT_ID }}
     steps:
-      # 1. Remove Cached Flutter Installation
-      - name: Remove Cached Flutter Installation
-        run: rm -rf $HOME/.flutter
+      # Checkout repository codebase
+      - name: Checkout the code
+        uses: actions/checkout@v4
 
-      - name: Clean up old build files
-        run: |
-          rm -rf build/app/outputs/bundle/release/*
+      # Setup Java in the VM
+      - name: Setup Java to compile the Android project
+        uses: actions/setup-java@v4
+        with:
+          distribution: "zulu"
+          java-version: ${{ env.JAVA_VERSION }}
 
-      # 2. Checkout repository
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
 
-      # 3. Install Flutter SDK
-      - name: Install Flutter
+      # Setup Flutter in the VM
+      - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.35.2
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          cache: true # Added caching to speed up builds
 
-      # 4. Verify Flutter and Dart Versions
-      - name: Verify Flutter Installation
-        run: |
-          flutter --version
-          dart --version
+      # Decode Android env variables
+      - name: Decode Android keystore
+        run: echo "${{ secrets.ANDROID_KEYSTORE }}" | base64 --decode > ${{ env.KEYSTORE_PATH }}
+
+      - name: Decode Android key properties
+        run: echo "${{ secrets.ANDROID_KEY_PROPERTIES }}" | base64 --decode > ${{ env.KEY_PROPS_PATH }}
+
+      # --- Steps Added to fix deployment ---
+      # Decode Android release Service Account
+      - name: Decode Android Service Account
+        run: echo "${{ secrets.ANDROID_RELEASE_SERVICE_ACCOUNT }}" | base64 --decode > ${{ env.SERVICE_ACCOUNT_PATH }}
 
-      # 6. Install Flutter dependencies
-      - name: Install Flutter Dependencies
+      #Decode Google Services JSON for Android
+      - name: Decode Android Google Services JSON
+        run: echo "${{ secrets.GOOGLE_SERVICES_ANDROID }}" | base64 --decode > ${{ env.GOOGLE_SERVICES_ANDROID_PATH }}
+
+      # Decode Firebase Options Dart file
+      - name: Decode Firebase Options
+        run: echo "${{ secrets.FIREBASE_OPTIONS }}" | base64 --decode > ${{ env.FIREBASE_OPTIONS_PATH }}
+      # --- End of Added Steps ---
+
+      - name: 📦 Install dependencies
         run: flutter pub get
 
-      # 7. Build Android APK
-      - name: Build Android App Bundle
-        run: flutter build apk --release --split-per-abi
+      - name: 📉 Run all app tests
+        run: flutter test
 
-      # 8. Upload build artifacts
-      - name: Upload APK as an artifact
+      # Build Android Bundle release file
+      - name: Build AAB
+        run: |
+          flutter build appbundle \
+          --release \
+          --dart-define=APPWRITE_BASE_DOMAIN=${{ secrets.APPWRITE_BASE_DOMAIN }} \
+          --dart-define=APPWRITE_PROJECT_ID=${{ secrets.APPWRITE_PROJECT_ID }}
+
+      # Upload generated aab to project artifacts
+      - name: Upload generated AAB to artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: app-release-apks
-          path: build/app/outputs/apk/release/*.apk
-
-  release:
-    runs-on: ubuntu-latest
-    needs: build
-    permissions:
-      contents: write
-    steps:
-      # 1. Checkout repository
-      - name: Checkout code
-        uses: actions/checkout@v4
+          name: aab-stores
+          path: ${{ env.AAB_PATH }}
 
-      # 2. Download build artifacts
-      - name: Download APK
-        uses: actions/download-artifact@v4
+      # --- Deploy to Google Play Store ---
+      - name: Deploy to Play Store (Internal testing)
+        uses: r0adkll/upload-google-play@v1
         with:
-          name: app-release-apks
-          path: build/app/outputs/bundle/release/
-
-      # 3. Upload to Github Release
-      - name: Github Release
+          serviceAccountJson: ${{ env.SERVICE_ACCOUNT_PATH }}
+          packageName: com.resonate.resonate # Using the package name from your other workflow
+          releaseFiles: ${{ env.AAB_PATH }}
+          track: internal
+      
+      # --- Added GitHub Release Step ---
+      - name: Deploy to GitHub Release
         uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
-          artifacts: build/app/outputs/bundle/release/*.apk
-          artifactContentType: apk
+          # This will find the .aab file in the release directory
+          artifacts: ${{ env.AAB_PATH }}
+          artifactContentType: aab
           generateReleaseNotes: true
           tag: latest_build
+          token: ${{ secrets.GITHUB_TOKEN }}
+

From a5c5f959b248212ee2dd4082336c87ebd47b6771 Mon Sep 17 00:00:00 2001
From: uju09 <24bcs012@iiitdwd.ac.in>
Date: Fri, 31 Oct 2025 20:56:48 +0530
Subject: [PATCH 02/10] fix: Updated build

Signed-off-by: uju09 <24bcs012@iiitdwd.ac.in>
---
 .github/workflows/build_and_deploy.yml | 64 ++++++++------------------
 1 file changed, 18 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index f7543583..df2a7101 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -1,8 +1,6 @@
-# Github Actions CI workflow to deploy to Internal testing in the Play Store
-name: CI_STORE_DEPLOY_ANDROID
+name: CI_GITHUB_RELEASE_ANDROID
 
 on:
-  # Run this workflow when any new code is pushed into the main branch
   push:
     branches:
       - main
@@ -10,104 +8,78 @@ on:
       - deploy-actions
 
 jobs:
-  store_deploy_android:
-    name: android store release
+  github_release_android:
+    name: Android GitHub Release
     runs-on: ubuntu-latest
     env:
-      # Setup env variables that will be used throughout the workflow
-      # Changed to Java 17 for better Gradle compatibility
       JAVA_VERSION: 17
       FLUTTER_VERSION: 3.35.2
       AAB_PATH: build/app/outputs/bundle/release/app-release.aab
       KEYSTORE_PATH: android/upload-keystore.jks
       KEY_PROPS_PATH: android/key.properties
-      # Added paths for Play Store and Firebase secrets
-      SERVICE_ACCOUNT_PATH: store_credentials.json
       FIREBASE_OPTIONS_PATH: lib/firebase_options.dart
       GOOGLE_SERVICES_ANDROID_PATH: android/app/google-services.json
       APPWRITE_PROJECT_ID: ${{ secrets.APPWRITE_PROJECT_ID }}
     steps:
-      # Checkout repository codebase
-      - name: Checkout the code
+      - name: Checkout repository
         uses: actions/checkout@v4
 
-      # Setup Java in the VM
-      - name: Setup Java to compile the Android project
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: "zulu"
+          distribution: zulu
           java-version: ${{ env.JAVA_VERSION }}
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
 
-      # Setup Flutter in the VM
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
-          cache: true # Added caching to speed up builds
+          cache: true
 
-      # Decode Android env variables
+      # --- Decode All Secrets ---
+      # These are required for the release build to sign the app
       - name: Decode Android keystore
         run: echo "${{ secrets.ANDROID_KEYSTORE }}" | base64 --decode > ${{ env.KEYSTORE_PATH }}
 
       - name: Decode Android key properties
         run: echo "${{ secrets.ANDROID_KEY_PROPERTIES }}" | base64 --decode > ${{ env.KEY_PROPS_PATH }}
 
-      # --- Steps Added to fix deployment ---
-      # Decode Android release Service Account
-      - name: Decode Android Service Account
-        run: echo "${{ secrets.ANDROID_RELEASE_SERVICE_ACCOUNT }}" | base64 --decode > ${{ env.SERVICE_ACCOUNT_PATH }}
-
-      #Decode Google Services JSON for Android
+      # These are required for Firebase/Google Services
       - name: Decode Android Google Services JSON
         run: echo "${{ secrets.GOOGLE_SERVICES_ANDROID }}" | base64 --decode > ${{ env.GOOGLE_SERVICES_ANDROID_PATH }}
 
-      # Decode Firebase Options Dart file
       - name: Decode Firebase Options
         run: echo "${{ secrets.FIREBASE_OPTIONS }}" | base64 --decode > ${{ env.FIREBASE_OPTIONS_PATH }}
-      # --- End of Added Steps ---
+      # --- End of Decode Steps ---
 
-      - name: 📦 Install dependencies
+      - name: Install Flutter dependencies
         run: flutter pub get
 
-      - name: 📉 Run all app tests
+      - name: Run tests
         run: flutter test
 
-      # Build Android Bundle release file
-      - name: Build AAB
+      # This build command is now correct
+      - name: Build Android App Bundle (AAB)
         run: |
-          flutter build appbundle \
-          --release \
+          flutter build appbundle --release \
           --dart-define=APPWRITE_BASE_DOMAIN=${{ secrets.APPWRITE_BASE_DOMAIN }} \
           --dart-define=APPWRITE_PROJECT_ID=${{ secrets.APPWRITE_PROJECT_ID }}
 
-      # Upload generated aab to project artifacts
-      - name: Upload generated AAB to artifacts
+      - name: Upload AAB artifact
         uses: actions/upload-artifact@v4
         with:
-          name: aab-stores
+          name: aab-release
           path: ${{ env.AAB_PATH }}
 
-      # --- Deploy to Google Play Store ---
-      - name: Deploy to Play Store (Internal testing)
-        uses: r0adkll/upload-google-play@v1
-        with:
-          serviceAccountJson: ${{ env.SERVICE_ACCOUNT_PATH }}
-          packageName: com.resonate.resonate # Using the package name from your other workflow
-          releaseFiles: ${{ env.AAB_PATH }}
-          track: internal
-      
-      # --- Added GitHub Release Step ---
       - name: Deploy to GitHub Release
         uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
-          # This will find the .aab file in the release directory
           artifacts: ${{ env.AAB_PATH }}
           artifactContentType: aab
           generateReleaseNotes: true
           tag: latest_build
           token: ${{ secrets.GITHUB_TOKEN }}
-

From 8a1d0f812bec2aeeb208fb9a8ab7f2424582336e Mon Sep 17 00:00:00 2001
From: uju09 <24bcs012@iiitdwd.ac.in>
Date: Fri, 31 Oct 2025 21:05:10 +0530
Subject: [PATCH 03/10] fix: Added cache and an debug step

Signed-off-by: uju09 <24bcs012@iiitdwd.ac.in>
---
 .github/workflows/build_and_deploy.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index df2a7101..220fcda4 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -1,22 +1,16 @@
-name: CI_GITHUB_RELEASE_ANDROID
-
-on:
-  push:
-    branches:
-      - main
-      - master
-      - deploy-actions
-
 jobs:
   github_release_android:
     name: Android GitHub Release
     runs-on: ubuntu-latest
+    # Add permissions for the release action to write to contents
+    permissions:
+      contents: write
     env:
       JAVA_VERSION: 17
       FLUTTER_VERSION: 3.35.2
       AAB_PATH: build/app/outputs/bundle/release/app-release.aab
-      KEYSTORE_PATH: android/upload-keystore.jks
-      KEY_PROPS_PATH: android/key.properties
+      KEYSTORE_PATH: upload-keystore.jks
+      KEY_PROPS_PATH: key.properties
       FIREBASE_OPTIONS_PATH: lib/firebase_options.dart
       GOOGLE_SERVICES_ANDROID_PATH: android/app/google-services.json
       APPWRITE_PROJECT_ID: ${{ secrets.APPWRITE_PROJECT_ID }}
@@ -68,6 +62,10 @@ jobs:
           --dart-define=APPWRITE_BASE_DOMAIN=${{ secrets.APPWRITE_BASE_DOMAIN }} \
           --dart-define=APPWRITE_PROJECT_ID=${{ secrets.APPWRITE_PROJECT_ID }}
 
+      # Debugging step to verify AAB file existence
+      - name: Verify AAB file existence
+        run: ls -lh ${{ env.AAB_PATH }} || true
+
       - name: Upload AAB artifact
         uses: actions/upload-artifact@v4
         with:

From a38745e9a7a6ab3a686e614d606b948b2cc9992a Mon Sep 17 00:00:00 2001
From: uju09 <24bcs012@iiitdwd.ac.in>
Date: Fri, 31 Oct 2025 21:07:29 +0530
Subject: [PATCH 04/10] fixed a small bug

Signed-off-by: uju09 <24bcs012@iiitdwd.ac.in>
---
 .github/workflows/build_and_deploy.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index 220fcda4..ebf6301a 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -1,3 +1,12 @@
+name: Build and Deploy
+
+on:
+  push:
+    branches:
+      - main
+      - master
+      - deploy-actions
+
 jobs:
   github_release_android:
     name: Android GitHub Release

From 7285482c0fffb7b579d2bc221435de4a727e7350 Mon Sep 17 00:00:00 2001
From: uju09 <24bcs012@iiitdwd.ac.in>
Date: Mon, 3 Nov 2025 23:56:19 +0530
Subject: [PATCH 05/10] fix(tests): changed from aab to apk

Signed-off-by: uju09 <24bcs012@iiitdwd.ac.in>
---
 .github/workflows/build_and_deploy.yml | 27 ++++++++++----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index ebf6301a..38b67ede 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -11,13 +11,12 @@ jobs:
   github_release_android:
     name: Android GitHub Release
     runs-on: ubuntu-latest
-    # Add permissions for the release action to write to contents
     permissions:
       contents: write
     env:
       JAVA_VERSION: 17
       FLUTTER_VERSION: 3.35.2
-      AAB_PATH: build/app/outputs/bundle/release/app-release.aab
+      APK_PATH: build/app/outputs/flutter-apk/app-release.apk
       KEYSTORE_PATH: upload-keystore.jks
       KEY_PROPS_PATH: key.properties
       FIREBASE_OPTIONS_PATH: lib/firebase_options.dart
@@ -42,21 +41,17 @@ jobs:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           cache: true
 
-      # --- Decode All Secrets ---
-      # These are required for the release build to sign the app
       - name: Decode Android keystore
         run: echo "${{ secrets.ANDROID_KEYSTORE }}" | base64 --decode > ${{ env.KEYSTORE_PATH }}
 
       - name: Decode Android key properties
         run: echo "${{ secrets.ANDROID_KEY_PROPERTIES }}" | base64 --decode > ${{ env.KEY_PROPS_PATH }}
 
-      # These are required for Firebase/Google Services
       - name: Decode Android Google Services JSON
         run: echo "${{ secrets.GOOGLE_SERVICES_ANDROID }}" | base64 --decode > ${{ env.GOOGLE_SERVICES_ANDROID_PATH }}
 
       - name: Decode Firebase Options
         run: echo "${{ secrets.FIREBASE_OPTIONS }}" | base64 --decode > ${{ env.FIREBASE_OPTIONS_PATH }}
-      # --- End of Decode Steps ---
 
       - name: Install Flutter dependencies
         run: flutter pub get
@@ -64,29 +59,27 @@ jobs:
       - name: Run tests
         run: flutter test
 
-      # This build command is now correct
-      - name: Build Android App Bundle (AAB)
+      - name: Build Android APK
         run: |
-          flutter build appbundle --release \
+          flutter build apk --release \
           --dart-define=APPWRITE_BASE_DOMAIN=${{ secrets.APPWRITE_BASE_DOMAIN }} \
           --dart-define=APPWRITE_PROJECT_ID=${{ secrets.APPWRITE_PROJECT_ID }}
 
-      # Debugging step to verify AAB file existence
-      - name: Verify AAB file existence
-        run: ls -lh ${{ env.AAB_PATH }} || true
+      - name: Verify APK file existence
+        run: ls -lh ${{ env.APK_PATH }} || true
 
-      - name: Upload AAB artifact
+      - name: Upload APK artifact
         uses: actions/upload-artifact@v4
         with:
-          name: aab-release
-          path: ${{ env.AAB_PATH }}
+          name: apk-release
+          path: ${{ env.APK_PATH }}
 
       - name: Deploy to GitHub Release
         uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
-          artifacts: ${{ env.AAB_PATH }}
-          artifactContentType: aab
+          artifacts: ${{ env.APK_PATH }}
+          artifactContentType: apk
           generateReleaseNotes: true
           tag: latest_build
           token: ${{ secrets.GITHUB_TOKEN }}

From 15701fb5465e9fe9c7d94619e893449dc31729a3 Mon Sep 17 00:00:00 2001
From: uju09 <24bcs012@iiitdwd.ac.in>
Date: Tue, 4 Nov 2025 14:43:08 +0530
Subject: [PATCH 06/10] updated the changes

Signed-off-by: uju09 <24bcs012@iiitdwd.ac.in>
---
 .github/workflows/build_and_deploy.yml | 43 ++++++++++++++++++--------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index 38b67ede..ab109cf5 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -8,17 +8,15 @@ on:
       - deploy-actions
 
 jobs:
-  github_release_android:
-    name: Android GitHub Release
+  build_android:
+    name: Build Android APK
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     env:
-      JAVA_VERSION: 17
+      JAVA_VERSION: 21
       FLUTTER_VERSION: 3.35.2
       APK_PATH: build/app/outputs/flutter-apk/app-release.apk
-      KEYSTORE_PATH: upload-keystore.jks
-      KEY_PROPS_PATH: key.properties
+      KEYSTORE_PATH: android/upload-keystore.jks
+      KEY_PROPS_PATH: android/key.properties
       FIREBASE_OPTIONS_PATH: lib/firebase_options.dart
       GOOGLE_SERVICES_ANDROID_PATH: android/app/google-services.json
       APPWRITE_PROJECT_ID: ${{ secrets.APPWRITE_PROJECT_ID }}
@@ -41,6 +39,12 @@ jobs:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           cache: true
 
+      - name: Clean Flutter cache
+        run: |
+          flutter clean
+          flutter pub cache clean --force
+          rm -rf ~/.pub-cache
+
       - name: Decode Android keystore
         run: echo "${{ secrets.ANDROID_KEYSTORE }}" | base64 --decode > ${{ env.KEYSTORE_PATH }}
 
@@ -66,20 +70,33 @@ jobs:
           --dart-define=APPWRITE_PROJECT_ID=${{ secrets.APPWRITE_PROJECT_ID }}
 
       - name: Verify APK file existence
-        run: ls -lh ${{ env.APK_PATH }} || true
+        run: |
+          if [ ! -f "${{ env.APK_PATH }}" ]; then
+            echo "❌ ERROR: APK file not found at ${{ env.APK_PATH }}"
+            echo "Build may have failed. Please check the build logs above."
+            exit 1
+          else
+            echo "APK file found:"
+            ls -lh "${{ env.APK_PATH }}"
+          fi
 
-      - name: Upload APK artifact
-        uses: actions/upload-artifact@v4
+  deploy_github_release:
+    name: Deploy to GitHub Release
+    runs-on: ubuntu-latest
+    needs: build_android
+    permissions:
+      contents: write
+    steps:
+      - name: Download APK artifact
+        uses: actions/download-artifact@v4
         with:
           name: apk-release
-          path: ${{ env.APK_PATH }}
 
       - name: Deploy to GitHub Release
         uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
-          artifacts: ${{ env.APK_PATH }}
+          artifacts: app-release.apk
           artifactContentType: apk
           generateReleaseNotes: true
           tag: latest_build
-          token: ${{ secrets.GITHUB_TOKEN }}

From d7b135070e9240404c2b9201af1a8a95db28e899 Mon Sep 17 00:00:00 2001
From: uju09 <24bcs012@iiitdwd.ac.in>
Date: Tue, 4 Nov 2025 14:51:19 +0530
Subject: [PATCH 07/10] added the missing lines

Signed-off-by: uju09 <24bcs012@iiitdwd.ac.in>
---
 .github/workflows/build_and_deploy.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index ab109cf5..7f519e8e 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -80,6 +80,12 @@ jobs:
             ls -lh "${{ env.APK_PATH }}"
           fi
 
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: apk-release
+          path: ${{ env.APK_PATH }}
+
   deploy_github_release:
     name: Deploy to GitHub Release
     runs-on: ubuntu-latest

From 4947dd54288502c9fd80209e29779a485b6d1511 Mon Sep 17 00:00:00 2001
From: uju09 <24bcs012@iiitdwd.ac.in>
Date: Tue, 4 Nov 2025 14:59:08 +0530
Subject: [PATCH 08/10] updated requested changes

Signed-off-by: uju09 <24bcs012@iiitdwd.ac.in>
---
 .github/workflows/build_and_deploy.yml | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index 7f519e8e..14b4f082 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -12,7 +12,7 @@ jobs:
     name: Build Android APK
     runs-on: ubuntu-latest
     env:
-      JAVA_VERSION: 21
+      JAVA_VERSION: 21.0.6
       FLUTTER_VERSION: 3.35.2
       APK_PATH: build/app/outputs/flutter-apk/app-release.apk
       KEYSTORE_PATH: android/upload-keystore.jks
@@ -37,13 +37,6 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
-          cache: true
-
-      - name: Clean Flutter cache
-        run: |
-          flutter clean
-          flutter pub cache clean --force
-          rm -rf ~/.pub-cache
 
       - name: Decode Android keystore
         run: echo "${{ secrets.ANDROID_KEYSTORE }}" | base64 --decode > ${{ env.KEYSTORE_PATH }}
@@ -70,15 +63,7 @@ jobs:
           --dart-define=APPWRITE_PROJECT_ID=${{ secrets.APPWRITE_PROJECT_ID }}
 
       - name: Verify APK file existence
-        run: |
-          if [ ! -f "${{ env.APK_PATH }}" ]; then
-            echo "❌ ERROR: APK file not found at ${{ env.APK_PATH }}"
-            echo "Build may have failed. Please check the build logs above."
-            exit 1
-          else
-            echo "APK file found:"
-            ls -lh "${{ env.APK_PATH }}"
-          fi
+        run: ls -lh ${{ env.APK_PATH }}
 
       - name: Upload APK artifact
         uses: actions/upload-artifact@v4
@@ -102,7 +87,7 @@ jobs:
         uses: ncipollo/release-action@v1.14.0
         with:
           allowUpdates: true
-          artifacts: app-release.apk
+          artifacts: ${{ env.APK_PATH }}
           artifactContentType: apk
           generateReleaseNotes: true
           tag: latest_build

From 6a2064bda20c38a1cf549134ac7efafad6d83a71 Mon Sep 17 00:00:00 2001
From: uju09 <24bcs012@iiitdwd.ac.in>
Date: Tue, 4 Nov 2025 15:10:30 +0530
Subject: [PATCH 09/10] removed master and added workflow-dispatch

Signed-off-by: uju09 <24bcs012@iiitdwd.ac.in>
---
 .github/workflows/build_and_deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index 14b4f082..df07a0cb 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - main
-      - master
       - deploy-actions
+  workflow_dispatch:
 
 jobs:
   build_android:

From cee89b6b13836fe4ad85d106e097a49d97ed27b3 Mon Sep 17 00:00:00 2001
From: uju09 <24bcs012@iiitdwd.ac.in>
Date: Tue, 4 Nov 2025 15:11:24 +0530
Subject: [PATCH 10/10] updated

Signed-off-by: uju09 <24bcs012@iiitdwd.ac.in>
---
 .github/workflows/build_and_deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index df07a0cb..48deace9 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -3,7 +3,7 @@ name: Build and Deploy
 on:
   push:
     branches:
-      - main
+      - master
       - deploy-actions
   workflow_dispatch: