From a5b635095b9d905bf0c89df1c41b9ce6f2a6bda8 Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Sat, 1 Jun 2024 12:31:00 +0200 Subject: [PATCH 1/7] downgrade flutter --- .github/workflows/build.yml | 2 +- dependencies.properties | 2 +- libcore | 2 +- pubspec.yaml | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 678183c2..0bff8050 100644 --- a/.github/workflows/build.yml +++ b/.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 }}" diff --git a/dependencies.properties b/dependencies.properties index 1a728064..7416e781 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -1 +1 @@ -core.version=1.1.0 \ No newline at end of file +core.version=1.3.0 \ No newline at end of file diff --git a/libcore b/libcore index ffce04a0..e725eb36 160000 --- a/libcore +++ b/libcore @@ -1 +1 @@ -Subproject commit ffce04a04ec4bda26ad83fe0b054c1137928dfa5 +Subproject commit e725eb36113f25ce2652e84701ed8decd429ea82 diff --git a/pubspec.yaml b/pubspec.yaml index 5fcac156..d843f9b4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,11 +1,11 @@ name: hiddify description: Cross Platform Multi Protocol Proxy Frontend. publish_to: "none" -version: 1.1.1+10101 +version: 1.3.2+10302 environment: sdk: ">=3.3.0 <4.0.0" - flutter: ">=3.22.0 <4.0.0" + flutter: ">=3.19.0 <4.0.0" dependencies: flutter: @@ -13,7 +13,7 @@ dependencies: flutter_localizations: sdk: flutter cupertino_icons: ^1.0.6 - intl: ^0.19.0 + intl: ^0.18.1 slang: ^3.30.1 slang_flutter: ^3.30.0 fpdart: ^1.1.0 @@ -59,11 +59,11 @@ 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 + 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 From eec0e4856a050a507f67f85e531daff3f3cfee9b Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Sat, 1 Jun 2024 12:35:16 +0200 Subject: [PATCH 2/7] update --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f18434eb..1711997f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,7 @@ on: branches: - main - dev + - android-fix-action-bug paths-ignore: - '**.md' - 'docs/**' From 0f02e6d50f65799bdd6025934059665d1554c543 Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Sat, 1 Jun 2024 14:29:41 +0200 Subject: [PATCH 3/7] update to flutter 3.21 --- .github/workflows/build.yml | 2 +- android/app/build.gradle | 10 ++-------- pubspec.lock | 2 +- pubspec.yaml | 14 ++++++++------ 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0bff8050..157678f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ on: env: IS_GITHUB_ACTIONS: 1 CHANNEL: "${{ inputs.channel }}" - FLUTTER_VERSION: '3.19.x' + FLUTTER_VERSION: '3.21.x' NDK_VERSION: r26d UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}" TAG_NAME: "${{ inputs.tag-name }}" diff --git a/android/app/build.gradle b/android/app/build.gradle index fbe5b7b6..f3c6e5aa 100644 --- a/android/app/build.gradle +++ b/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' diff --git a/pubspec.lock b/pubspec.lock index 81bbc137..c447c967 100644 --- a/pubspec.lock +++ b/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" diff --git a/pubspec.yaml b/pubspec.yaml index d843f9b4..3e51fa60 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,7 +13,13 @@ dependencies: flutter_localizations: sdk: flutter cupertino_icons: ^1.0.6 - intl: ^0.18.1 + # 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 From 2ef06eaaa5cb4207a3fff6e381d09cd6b11942df Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Sat, 1 Jun 2024 14:31:50 +0200 Subject: [PATCH 4/7] upgrade flutter --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 157678f8..678183c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ on: env: IS_GITHUB_ACTIONS: 1 CHANNEL: "${{ inputs.channel }}" - FLUTTER_VERSION: '3.21.x' + FLUTTER_VERSION: '3.22.1' NDK_VERSION: r26d UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}" TAG_NAME: "${{ inputs.tag-name }}" From 4c48ae51f1cb7d74fe783f9e1ac7e88841b40c0e Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Sat, 1 Jun 2024 15:04:18 +0200 Subject: [PATCH 5/7] downgrade to 3.22.0 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 678183c2..b8c10652 100644 --- a/.github/workflows/build.yml +++ b/.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.22.0' NDK_VERSION: r26d UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}" TAG_NAME: "${{ inputs.tag-name }}" From 762fa83fcf650bcd88a9415b1cda4ea5555be6dd Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Sat, 1 Jun 2024 15:19:40 +0200 Subject: [PATCH 6/7] master --- .github/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8c10652..1b615229 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,8 +38,8 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2.16.0 #issue with 2.13 with: - flutter-version: ${{ env.FLUTTER_VERSION }} - channel: 'stable' + # flutter-version: ${{ env.FLUTTER_VERSION }} + channel: 'master' cache: true - name: Prepare @@ -111,9 +111,10 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.16.0 #issue with 2.13 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + # flutter-version: ${{ env.FLUTTER_VERSION }} # flutter-version-file: pubspec.yaml - channel: 'stable' + # channel: 'stable' + channel: 'master' cache: true From 3678cc571e40b2ca2c6ac560665bfe0a196328e2 Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Sat, 1 Jun 2024 15:36:19 +0200 Subject: [PATCH 7/7] downgrade flutter --- .github/workflows/build.yml | 51 ++++++++++++++++++------------------- pubspec.yaml | 14 +++++----- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b615229..e7f78368 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ on: env: IS_GITHUB_ACTIONS: 1 CHANNEL: "${{ inputs.channel }}" - FLUTTER_VERSION: '3.22.0' + FLUTTER_VERSION: '3.19.x' NDK_VERSION: r26d UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}" TAG_NAME: "${{ inputs.tag-name }}" @@ -38,8 +38,8 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2.16.0 #issue with 2.13 with: - # flutter-version: ${{ env.FLUTTER_VERSION }} - channel: 'master' + flutter-version: ${{ env.FLUTTER_VERSION }} + channel: 'stable' cache: true - name: Prepare @@ -63,30 +63,30 @@ jobs: os: ubuntu-latest targets: apk - # - platform: android-aab - # os: ubuntu-latest - # targets: aab + - platform: android-aab + os: ubuntu-latest + targets: aab - # - platform: windows - # os: windows-2019 - # aarch: amd64 - # targets: exe,msix + - platform: windows + os: windows-2019 + aarch: amd64 + targets: exe,msix - # - platform: linux - # os: ubuntu-22.04 - # aarch: amd64 - # targets: AppImage,deb,rpm + - platform: linux + os: ubuntu-22.04 + aarch: amd64 + targets: AppImage,deb,rpm - # - platform: macos - # os: macos-13 - # aarch: universal - # targets: dmg,pkg + - platform: macos + os: macos-13 + aarch: universal + targets: dmg,pkg - # - platform: ios - # os: macos-13 - # aarch: universal - # filename: hiddify-ios - # targets: ipa + - platform: ios + os: macos-13 + aarch: universal + filename: hiddify-ios + targets: ipa runs-on: ${{ matrix.os }} steps: - name: checkout @@ -111,10 +111,9 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.16.0 #issue with 2.13 with: - # flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version: ${{ env.FLUTTER_VERSION }} # flutter-version-file: pubspec.yaml - # channel: 'stable' - channel: 'master' + channel: 'stable' cache: true diff --git a/pubspec.yaml b/pubspec.yaml index 3e51fa60..ee02e99a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,13 +13,13 @@ dependencies: flutter_localizations: sdk: flutter cupertino_icons: ^1.0.6 - # intl: ^0.18.1 - # humanizer: ^2.2.0 - intl: ^0.19.0 - humanizer: - git: - url: https://github.com/alex-relov/humanizer - ref: up-version + 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