From 73368b58be217987edc79d771a7e8b4dd95863b6 Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Mon, 24 Jun 2024 23:55:37 +0700 Subject: [PATCH] build: Support for Flutter 3.22 (#1921) Signed-off-by: validcube --- .github/workflows/build_pull_request.yml | 1 + .github/workflows/release.yml | 1 + .github/workflows/sync_crowdin.yml | 1 + android/app/build.gradle | 4 ++- pubspec.lock | 39 ++++++++++++------------ pubspec.yaml | 5 ++- 6 files changed, 30 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 2257e749a2..ad3020f391 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -61,6 +61,7 @@ jobs: uses: subosito/flutter-action@v2 with: channel: "stable" + flutter-version: 3.22.x cache: ${{ inputs.flutter-cache }} - name: Get dependencies diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d80328484a..c467d13917 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,6 +36,7 @@ jobs: uses: subosito/flutter-action@v2 with: channel: "stable" + flutter-version: 3.22.x - name: Install dependencies run: npm install diff --git a/.github/workflows/sync_crowdin.yml b/.github/workflows/sync_crowdin.yml index ab850d6c83..b10e837335 100644 --- a/.github/workflows/sync_crowdin.yml +++ b/.github/workflows/sync_crowdin.yml @@ -25,6 +25,7 @@ jobs: uses: subosito/flutter-action@v2 with: cache: true + flutter-version: 3.22.x - name: Sync translations from Crowdin uses: crowdin/github-action@v1 diff --git a/android/app/build.gradle b/android/app/build.gradle index 7a34e02422..565e9677a2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -23,10 +23,11 @@ if (flutterVersionName == null) { } android { - compileSdk flutter.compileSdkVersion + compileSdk 34 ndkVersion flutter.ndkVersion compileOptions { + coreLibraryDesugaringEnabled true sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 } @@ -113,6 +114,7 @@ flutter { } dependencies { + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") // https://pub.dev/packages/flutter_local_notifications#gradle-setup implementation("app.revanced:revanced-patcher:19.3.1") implementation("app.revanced:revanced-library:2.2.1") } diff --git a/pubspec.lock b/pubspec.lock index a1c39cc83a..3f7dd5eae0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -323,9 +323,9 @@ packages: dependency: "direct main" description: path: "." - ref: "560d21c4148b53933313573e7eafca0b0eb9aadf" - resolved-ref: "560d21c4148b53933313573e7eafca0b0eb9aadf" - url: "https://github.com/BenjaminHalko/flutter_background" + ref: "900a81501f1f0e4996fe9e2cbf55f1ea8df08b49" + resolved-ref: "900a81501f1f0e4996fe9e2cbf55f1ea8df08b49" + url: "https://github.com/validcube/flutter_background" source: git version: "1.2.0" flutter_cache_manager: @@ -571,18 +571,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -644,18 +644,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.14.0" mime: dependency: transitive description: @@ -989,10 +989,11 @@ packages: skeletons: dependency: "direct main" description: - name: skeletons - sha256: "5b2d08ae7f908ee1f7007ca99f8dcebb4bfc1d3cb2143dec8d112a5be5a45c8f" - url: "https://pub.dev" - source: hosted + path: "." + ref: "326fbb4223ac4d8a6301cc2f16b6112ecd308c71" + resolved-ref: "326fbb4223ac4d8a6301cc2f16b6112ecd308c71" + url: "https://github.com/Ofceab-Studio/skeletons" + source: git version: "0.0.3" sky_engine: dependency: transitive @@ -1147,10 +1148,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.1" timeago: dependency: "direct main" description: @@ -1275,10 +1276,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.2" wakelock_plus: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index decab2ae83..43ed2f60bd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -59,7 +59,10 @@ dependencies: ref: 1a1616ac91e16cd1f3dd170a81febf27ffce3587 # Branch: master share_plus: ^9.0.0 shared_preferences: ^2.2.3 - skeletons: ^0.0.3 + skeletons: + git: # remove once https://github.com/badjio/skeletons/pull/11 is merged + url: https://github.com/Ofceab-Studio/skeletons + ref: 326fbb4223ac4d8a6301cc2f16b6112ecd308c71 # Branch: master slang: ^3.30.2 slang_flutter: ^3.30.0 stacked: ^3.4.2