Merge branch 'android-fix-action-bug'

.github/workflows/build.yml

@@ -15,7 +15,7 @@ on:
 env:
   IS_GITHUB_ACTIONS: 1
   CHANNEL: "${{ inputs.channel }}"
-  FLUTTER_VERSION: '3.22.1'
+  FLUTTER_VERSION: '3.19.x'
   NDK_VERSION: r26d
   UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}"
   TAG_NAME: "${{ inputs.tag-name }}"
@@ -59,9 +59,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # - platform: android-apk
-          #   os: ubuntu-latest
-          #   targets: apk
+          - platform: android-apk
+            os: ubuntu-latest
+            targets: apk
 
           - platform: android-aab
             os: ubuntu-latest

.github/workflows/ci.yml

@@ -10,6 +10,7 @@ on:
     branches:
        - main
        - dev
+       - android-fix-action-bug
     paths-ignore:
       - '**.md'
       - 'docs/**'

android/app/build.gradle

@@ -30,15 +30,9 @@ if (keystorePropertiesFile.exists()) {
     println "+++"
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')?: '1'
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
+def flutterVersionName = localProperties.getProperty('flutter.versionName') ?: '1.0'
 
 android {
     namespace 'com.hiddify.hiddify'

pubspec.lock

@@ -2030,4 +2030,4 @@ packages:
     version: "2.1.1"
 sdks:
   dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.22.0"
+  flutter: ">=3.19.0"

pubspec.yaml

@@ -5,7 +5,7 @@ version: 1.3.2+10302
 
 environment:
   sdk: ">=3.3.0 <4.0.0"
-  flutter: ">=3.22.0 <4.0.0"
+  flutter: ">=3.19.0 <3.22.0"
 
 dependencies:
   flutter:
@@ -13,7 +13,13 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   cupertino_icons: ^1.0.6
-  intl: ^0.19.0
+  intl: ^0.18.1
+  humanizer: ^2.2.0
+  # intl: ^0.19.0
+  # humanizer:
+  #   git:
+  #     url: https://github.com/alex-relov/humanizer
+  #     ref: up-version
   slang: ^3.30.1
   slang_flutter: ^3.30.0
   fpdart: ^1.1.0
@@ -59,11 +65,7 @@ dependencies:
   percent_indicator: ^4.2.3
   sliver_tools: ^0.2.12
   flutter_adaptive_scaffold: ^0.1.8
-  # humanizer: ^2.2.0
-  humanizer:
-    git:
-      url: https://github.com/alex-relov/humanizer
-      ref: up-version
+
   upgrader: ^9.0.0
   toastification: ^1.2.1
   version: ^3.0.2