From e557f90ba2c0668bcec6a0738436f332d9e6981c Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 13:27:28 +0000
Subject: [PATCH 01/13] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/test.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 59cf2638..1aea8d07 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -12,14 +12,12 @@ jobs:
     runs-on: [ dev-office ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK
-        uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: ${{ env.java_version }}
-        id: setup-jdk
 
       - name: Install Android SDK
         run: |
@@ -79,7 +77,7 @@ jobs:
           echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV                    
 
       - name: Upload APK artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.APK_NAME }}
           path: ${{ env.APK_NAME }}

From 7cec613f3aa6299ff87036592624523a6e0405bf Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 13:40:25 +0000
Subject: [PATCH 02/13] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/test.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 1aea8d07..7774ef0c 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -20,6 +20,12 @@ jobs:
           java-version: ${{ env.java_version }}
 
       - name: Install Android SDK
+      - uses: actions/cache@v4
+        with: 
+          path: |
+            /root/Android/Sdk
+          key: ${{ runner.os }}-sdk-
+          restore-keys: ${{ runner.os }}-sdk-
         run: |
           apt-get update
           apt-get install -y openjdk-11-jdk wget

From 47d10bd912aa05b538d0e2e114edaf697d30d25d Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 13:41:57 +0000
Subject: [PATCH 03/13] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 7774ef0c..96e656f2 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -12,15 +12,15 @@ jobs:
     runs-on: [ dev-office ]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
           java-version: ${{ env.java_version }}
 
       - name: Install Android SDK
-      - uses: actions/cache@v4
+      - uses: actions/cache@v3
         with: 
           path: |
             /root/Android/Sdk

From addb4fb25d323ca158e511e80559aae7c13642af Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 13:43:52 +0000
Subject: [PATCH 04/13] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/test.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 96e656f2..5a784a09 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -20,8 +20,20 @@ jobs:
           java-version: ${{ env.java_version }}
 
       - name: Install Android SDK
+        run: |
+          apt-get update
+          apt-get install -y openjdk-11-jdk wget
+          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
+          unzip commandlinetools.zip
+          mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
+          mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
+          export ANDROID_SDK_ROOT=$HOME/Android/Sdk
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
+          yes | sdkmanager --licenses 2>/dev/null || true  
+
+      - name: Cache Android SDK
       - uses: actions/cache@v3
-        with: 
+        with:
           path: |
             /root/Android/Sdk
           key: ${{ runner.os }}-sdk-

From a43db5844b321db1814d7399c2e38748124bb0b0 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 13:44:01 +0000
Subject: [PATCH 05/13] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/test.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 5a784a09..e3f55574 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -37,17 +37,7 @@ jobs:
           path: |
             /root/Android/Sdk
           key: ${{ runner.os }}-sdk-
-          restore-keys: ${{ runner.os }}-sdk-
-        run: |
-          apt-get update
-          apt-get install -y openjdk-11-jdk wget
-          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
-          unzip commandlinetools.zip
-          mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
-          mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
-          export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          yes | sdkmanager --licenses 2>/dev/null || true                      
+          restore-keys: ${{ runner.os }}-sdk-                 
 
       - name: Set up Android environment variables
         run: |

From 4420b1dee4ce0e3f992c5ec262d21c90428f990a Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 16:45:58 +0300
Subject: [PATCH 06/13] fix: cache sdk

---
 .gitea/workflows/build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index e8e16098..047ab43a 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -32,6 +32,12 @@ jobs:
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
+      - uses: actions/cache@v3
+        with:
+          path: |
+            /root/Android/Sdk
+          key: ${{ runner.os }}-sdk-
+          restore-keys: ${{ runner.os }}-sdk-
 
       - name: Set up Android environment variables
         run: |

From 98e4b799b90a7f9d26f3bcde7110f80226ef21d4 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 16:47:48 +0300
Subject: [PATCH 07/13] fix: cache jdk

---
 .gitea/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 047ab43a..4e781f3f 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -19,7 +19,6 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: ${{ env.java_version }}
-          cache: 'gradle'
 
       - name: Install Android SDK
         run: |

From ec72d762810811393916f1c5cf5025c1649fc533 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 13:48:29 +0000
Subject: [PATCH 08/13] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/test.yml | 63 +++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index e3f55574..4e781f3f 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -1,22 +1,23 @@
-name: Eatvio App Android Test
+name: Android Release
 
-on: [ pull_request ]
+on: [ push, pull_request ]
 
 env:
-  flutter_version: "3.24.5"
-  java_version: "21.x"
+  flutter_version: "3.22.0"
+  java_version: "12.x"
   flutter_channel: "stable"
 
 jobs:
   build:
-    runs-on: [ dev-office ]
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          distribution: "zulu"
+          distribution: 'zulu'
           java-version: ${{ env.java_version }}
 
       - name: Install Android SDK
@@ -29,25 +30,24 @@ jobs:
           mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          yes | sdkmanager --licenses 2>/dev/null || true  
-
-      - name: Cache Android SDK
+          sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
       - uses: actions/cache@v3
         with:
           path: |
             /root/Android/Sdk
           key: ${{ runner.os }}-sdk-
-          restore-keys: ${{ runner.os }}-sdk-                 
+          restore-keys: ${{ runner.os }}-sdk-
 
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
-          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV                    
+          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
 
-      - name: Install jq
-        run: |
-          apt-get install -y jq                    
+      - uses: actions/cache@v2
+        with:
+          path: ${{ runner.tool_cache }}/flutter
+          key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }}
 
       - id: flutter-action
         uses: actions/flutter-action@v2
@@ -56,11 +56,21 @@ jobs:
           flutter-version: ${{ env.flutter_version }}
           cache: true
 
-      - name: Fix dir permissions
+      - name: show cache keys
+        run: |
+          echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
+          echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }}
+          echo CHANNEL=${{ steps.flutter-action.outputs.CHANNEL }}
+          echo VERSION=${{ steps.flutter-action.outputs.VERSION }}
+          echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }}
+          echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }}
+          echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }}
+        shell: bash
+
+      - name: fix dir permissions
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
-          flutter config --android-sdk="$ANDROID_HOME"
-          flutter doctor -v                    
+          flutter --version
 
       - name: Get dependencies
         run: flutter pub get
@@ -68,13 +78,15 @@ jobs:
       - name: Native Analyze
         run: flutter analyze
 
+      - name: Run Code Metrics
+        run: flutter pub run dart_code_metrics:metrics lib --disable-sunset-warning --fatal-warnings --fatal-performance
+
       - name: Test
         run: |
-          flutter test                    
+          flutter test
 
       - name: Build apk
-        run: |
-          flutter build apk                    
+        run: flutter build apk
 
       - name: Rename and move apk
         run: |
@@ -82,10 +94,3 @@ jobs:
           APK_NAME="eatvio_app_${TIMESTAMP}.apk"
           mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
           echo "APK build finished $APK_NAME"
-          echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV                    
-
-      - name: Upload APK artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.APK_NAME }}
-          path: ${{ env.APK_NAME }}

From f0f3f732f5541d0b5d8b299f63246c1c3c215856 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 16:49:57 +0300
Subject: [PATCH 09/13] fix: cache

---
 .gitea/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 4e781f3f..532317ec 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
           echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ${{ runner.tool_cache }}/flutter
           key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }}
@@ -54,7 +54,6 @@ jobs:
         with:
           channel: ${{ env.flutter_channel }}
           flutter-version: ${{ env.flutter_version }}
-          cache: true
 
       - name: show cache keys
         run: |

From efcb2ce2eee6b0e9982424568121e7c94b5a3537 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 16:51:16 +0300
Subject: [PATCH 10/13] fix: cache 1

---
 .gitea/workflows/build.yml | 64 ++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 37 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 532317ec..a6d70a2a 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -1,15 +1,15 @@
-name: Android Release
+name: Eatvio App Android Test
 
-on: [ push, pull_request ]
+on: [ pull_request ]
 
 env:
-  flutter_version: "3.22.0"
-  java_version: "12.x"
+  flutter_version: "3.24.5"
+  java_version: "21.x"
   flutter_channel: "stable"
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: [ dev-office ]
 
     steps:
       - uses: actions/checkout@v3
@@ -17,8 +17,9 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: "zulu"
           java-version: ${{ env.java_version }}
+        id: setup-jdk
 
       - name: Install Android SDK
         run: |
@@ -30,46 +31,30 @@ jobs:
           mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
-      - uses: actions/cache@v3
-        with:
-          path: |
-            /root/Android/Sdk
-          key: ${{ runner.os }}-sdk-
-          restore-keys: ${{ runner.os }}-sdk-
+          yes | sdkmanager --licenses 2>/dev/null || true                                
 
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
-          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
+          echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV                              
 
-      - uses: actions/cache@v3
-        with:
-          path: ${{ runner.tool_cache }}/flutter
-          key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }}
+      - name: Install jq
+        run: |
+          apt-get install -y jq                              
 
       - id: flutter-action
         uses: actions/flutter-action@v2
         with:
           channel: ${{ env.flutter_channel }}
           flutter-version: ${{ env.flutter_version }}
+          cache: true
 
-      - name: show cache keys
-        run: |
-          echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
-          echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }}
-          echo CHANNEL=${{ steps.flutter-action.outputs.CHANNEL }}
-          echo VERSION=${{ steps.flutter-action.outputs.VERSION }}
-          echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }}
-          echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }}
-          echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }}
-        shell: bash
-
-      - name: fix dir permissions
+      - name: Fix dir permissions
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
-          flutter --version
+          flutter config --android-sdk="$ANDROID_HOME"
+          flutter doctor -v                              
 
       - name: Get dependencies
         run: flutter pub get
@@ -77,15 +62,13 @@ jobs:
       - name: Native Analyze
         run: flutter analyze
 
-      - name: Run Code Metrics
-        run: flutter pub run dart_code_metrics:metrics lib --disable-sunset-warning --fatal-warnings --fatal-performance
-
       - name: Test
         run: |
-          flutter test
+          flutter test                              
 
       - name: Build apk
-        run: flutter build apk
+        run: |
+          flutter build apk                              
 
       - name: Rename and move apk
         run: |
@@ -93,3 +76,10 @@ jobs:
           APK_NAME="eatvio_app_${TIMESTAMP}.apk"
           mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
           echo "APK build finished $APK_NAME"
+          echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV                              
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.APK_NAME }}
+          path: ${{ env.APK_NAME }}

From 3f4077a3387b34e7a008a81f9ab661a1b0bcd1c6 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 13:52:38 +0000
Subject: [PATCH 11/13] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/test.yml | 63 ++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 4e781f3f..a6d70a2a 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -1,15 +1,15 @@
-name: Android Release
+name: Eatvio App Android Test
 
-on: [ push, pull_request ]
+on: [ pull_request ]
 
 env:
-  flutter_version: "3.22.0"
-  java_version: "12.x"
+  flutter_version: "3.24.5"
+  java_version: "21.x"
   flutter_channel: "stable"
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: [ dev-office ]
 
     steps:
       - uses: actions/checkout@v3
@@ -17,8 +17,9 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: "zulu"
           java-version: ${{ env.java_version }}
+        id: setup-jdk
 
       - name: Install Android SDK
         run: |
@@ -30,24 +31,17 @@ jobs:
           mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
-      - uses: actions/cache@v3
-        with:
-          path: |
-            /root/Android/Sdk
-          key: ${{ runner.os }}-sdk-
-          restore-keys: ${{ runner.os }}-sdk-
+          yes | sdkmanager --licenses 2>/dev/null || true                                
 
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
-          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
+          echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV                              
 
-      - uses: actions/cache@v2
-        with:
-          path: ${{ runner.tool_cache }}/flutter
-          key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }}
+      - name: Install jq
+        run: |
+          apt-get install -y jq                              
 
       - id: flutter-action
         uses: actions/flutter-action@v2
@@ -56,21 +50,11 @@ jobs:
           flutter-version: ${{ env.flutter_version }}
           cache: true
 
-      - name: show cache keys
-        run: |
-          echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
-          echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }}
-          echo CHANNEL=${{ steps.flutter-action.outputs.CHANNEL }}
-          echo VERSION=${{ steps.flutter-action.outputs.VERSION }}
-          echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }}
-          echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }}
-          echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }}
-        shell: bash
-
-      - name: fix dir permissions
+      - name: Fix dir permissions
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
-          flutter --version
+          flutter config --android-sdk="$ANDROID_HOME"
+          flutter doctor -v                              
 
       - name: Get dependencies
         run: flutter pub get
@@ -78,15 +62,13 @@ jobs:
       - name: Native Analyze
         run: flutter analyze
 
-      - name: Run Code Metrics
-        run: flutter pub run dart_code_metrics:metrics lib --disable-sunset-warning --fatal-warnings --fatal-performance
-
       - name: Test
         run: |
-          flutter test
+          flutter test                              
 
       - name: Build apk
-        run: flutter build apk
+        run: |
+          flutter build apk                              
 
       - name: Rename and move apk
         run: |
@@ -94,3 +76,10 @@ jobs:
           APK_NAME="eatvio_app_${TIMESTAMP}.apk"
           mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
           echo "APK build finished $APK_NAME"
+          echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV                              
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.APK_NAME }}
+          path: ${{ env.APK_NAME }}

From 7979fe17dab2a522cad37da9e832020aa93fdb58 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 14:24:49 +0000
Subject: [PATCH 12/13] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/test.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index a6d70a2a..6e226eed 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -19,12 +19,11 @@ jobs:
         with:
           distribution: "zulu"
           java-version: ${{ env.java_version }}
-        id: setup-jdk
 
       - name: Install Android SDK
         run: |
           apt-get update
-          apt-get install -y openjdk-11-jdk wget
+          apt-get install -y openjdk-21-jdk wget
           wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
           unzip commandlinetools.zip
           mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
@@ -48,7 +47,6 @@ jobs:
         with:
           channel: ${{ env.flutter_channel }}
           flutter-version: ${{ env.flutter_version }}
-          cache: true
 
       - name: Fix dir permissions
         run: |

From 3f45a50202302a6fc56ebcc6b5c5074fafa9db76 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 14:26:13 +0000
Subject: [PATCH 13/13] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20.gitea/workflows/test.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/test.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 6e226eed..0c90ced6 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Install Android SDK
         run: |
           apt-get update
-          apt-get install -y openjdk-21-jdk wget
+          apt-get install -y openjdk-11-jdk wget
           wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
           unzip commandlinetools.zip
           mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
@@ -39,8 +39,7 @@ jobs:
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV                              
 
       - name: Install jq
-        run: |
-          apt-get install -y jq                              
+        run: apt-get install -y jq                              
 
       - id: flutter-action
         uses: actions/flutter-action@v2
@@ -61,12 +60,10 @@ jobs:
         run: flutter analyze
 
       - name: Test
-        run: |
-          flutter test                              
+        run: flutter test                              
 
       - name: Build apk
-        run: |
-          flutter build apk                              
+        run: flutter build apk                              
 
       - name: Rename and move apk
         run: |