From ee3b7cd751d6bb339a44e7665bf218178abaf276 Mon Sep 17 00:00:00 2001
From: "balazsmanus@chameleon" <contact@mnus.moe>
Date: Tue, 25 Feb 2025 16:38:59 +0100
Subject: [PATCH] fix android build workflow

---
 .github/workflows/android.yml                 | 35 ++++++++++++-------
 fix-pub.sh                                    | 19 ++++++++++
 .../lib/pages/timetable/timetable_page.dart   |  1 -
 3 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 fix-pub.sh

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 5927722a..488b3d3e 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -4,37 +4,48 @@ on: workflow_dispatch
 
 jobs:
   build:
+    name: Build for Android
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v3
+      - name: Download repository
+        uses: actions/checkout@latest
+
       - name: Download Android keystore
         id: android_keystore
-        uses: timheuer/base64-to-file@v1.0.3
+        uses: timheuer/base64-to-file@latest
         with:
-          fileName: upload-keystore.jks
+          fileName: firkaapp.jks
           encodedString: ${{ secrets.KEYSTORE_BASE64 }}
+
       - name: Create key.properties
         run: |
           echo "storeFile=${{ steps.android_keystore.outputs.filePath }}" > refilc/android/key.properties
-          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> refilc/android/key.properties
+          echo "storePassword=${{ secrets.KEY_PASSWORD }}" >> refilc/android/key.properties
           echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> refilc/android/key.properties
           echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> refilc/android/key.properties
-      - uses: actions/setup-java@v3
+          cp refilc/android/key.properties refilc/android/debugkey.properties
+
+      - uses: actions/setup-java@latest
         with:
-          distribution: "zulu"
-          java-version: "17.x"
+          distribution: "temurin"
+          java-version: "17"
           cache: "gradle"
-      - uses: subosito/flutter-action@v2
+
+      - uses: subosito/flutter-action@latest
         with:
-          flutter-version: "3.10.2"
+          flutter-version: "3.27.1"
           channel: "stable"
           cache: "true"
+
       - name: Install dependencies
         run: ./fix-pub.sh
+
       - name: Build
-        run: cd refilc && ./build.sh
+        run: ./refilc/build.sh
+
       - name: Upload Android Release
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@latest
         with:
           name: android-release
-          path: build/outputs/flutter-apk/app-release.apk
+          path: refilc/build/app/outputs/flutter-apk/app-*-release.apk
diff --git a/fix-pub.sh b/fix-pub.sh
new file mode 100644
index 00000000..395d7d1a
--- /dev/null
+++ b/fix-pub.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+cd refilc
+flutter clean
+flutter pub get
+
+cd ../refilc_kreta_api
+flutter clean
+flutter pub get
+
+cd ../refilc_mobile_ui
+flutter clean
+flutter pub get
+
+cd ../refilc_plus
+flutter clean
+flutter pub get
+
+cd ..
\ No newline at end of file
diff --git a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart
index 6241267e..80b134f7 100644
--- a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart
+++ b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart
@@ -5,7 +5,6 @@ import 'package:i18n_extension/i18n_extension.dart';
 import 'package:refilc/api/providers/database_provider.dart';
 import 'package:refilc/api/providers/update_provider.dart';
 import 'package:refilc/models/settings.dart';
-import 'package:refilc/providers/third_party_provider.dart';
 import 'package:refilc/utils/format.dart';
 import 'package:refilc_kreta_api/client/client.dart';
 import 'package:refilc_kreta_api/models/week.dart';