Merge branch 'fix_flutter'

flutter/flutter-android.gitlab-ci.yml

@@ -15,9 +15,10 @@ stages:
 variables:
   SIGNING_PROPERTIES_FILE: android/signing.properties
   SINGING_KEYSTORE_FILE: android/signing-keystore.jks
-  FLUTTER_ANDROID_IMAGE: registry.420joos.dev/flutter:3.19.0-android
+  FLUTTER_ANDROID_IMAGE: andrijoos/flutter:3.24.5-android
+  BUNDLETOOL_IMAGE: andrijoos/bundletool
 
-android_build:
+android:
   stage: build
   image: 
     name: ${FLUTTER_ANDROID_IMAGE}
@@ -39,16 +40,16 @@ android_build:
   after_script:
     - mv ${APP_DIRECTORY}/build/app/outputs/bundle/release/app-release.aab ./{APP_NAME}.aab
 
-apks:
+.build_universal_apk:
   stage: build
   image: 
-    name: ${FLUTTER_ANDROID_IMAGE}
+    name: ${BUNDLETOOL_IMAGE}
     pull_policy: always
   tags:
     - amd64
   when: manual
   needs:
-    - android_build
+    - android
   artifacts:
     paths:
       - ${APP_NAME}_${APPLICATION_VERSION}.apk