From 55674d98aafb88191724c38f4046341e50547c44 Mon Sep 17 00:00:00 2001 From: validcube Date: Tue, 28 May 2024 22:27:30 +0700 Subject: [PATCH 1/9] build: Introduce Flutter lock to v3.19.6 --- .github/workflows/build_pull_request.yml | 1 + .github/workflows/release.yml | 1 + .github/workflows/sync_crowdin.yml | 1 + .vscode/settings.json | 3 +++ android/app/build.gradle | 6 +++-- docs/4_building.md | 2 +- pubspec.lock | 34 ++++++++++++------------ pubspec.yaml | 2 +- 8 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 2257e749a2..f68fd2131d 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.19.x cache: ${{ inputs.flutter-cache }} - name: Get dependencies diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d80328484a..f9a1b8da25 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.19.x - name: Install dependencies run: npm install diff --git a/.github/workflows/sync_crowdin.yml b/.github/workflows/sync_crowdin.yml index 02ca74b42a..a9478c2cbc 100644 --- a/.github/workflows/sync_crowdin.yml +++ b/.github/workflows/sync_crowdin.yml @@ -24,6 +24,7 @@ jobs: uses: subosito/flutter-action@v2 with: cache: true + flutter-version: 3.19.x - name: Sync translations from Crowdin uses: crowdin/github-action@v1 diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..8a68bfdcdb --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "dart.flutterSdkPath": ".fvm/versions/3.19.6" +} \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 7a34e02422..713cb35b07 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -23,10 +23,11 @@ if (flutterVersionName == null) { } android { - compileSdk flutter.compileSdkVersion - ndkVersion flutter.ndkVersion + compileSdk 34 + ndkVersion "26.1.10909125" 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/docs/4_building.md b/docs/4_building.md index aa52df882b..d1a9cb708a 100644 --- a/docs/4_building.md +++ b/docs/4_building.md @@ -2,7 +2,7 @@ Learn how to build ReVanced Manager from source. -1. Setup the Flutter environment for your [platform](https://docs.flutter.dev/get-started/install) +1. Setup the Flutter environment for your [platform](https://docs.flutter.dev/get-started/install) with version **3.19.6** 2. Clone the repository diff --git a/pubspec.lock b/pubspec.lock index a1c39cc83a..fb371e2d4a 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: @@ -515,10 +515,10 @@ packages: dependency: "direct main" description: name: intl - sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.19.0" + version: "0.18.1" io: dependency: transitive description: @@ -571,26 +571,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.0" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "2.0.1" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "2.0.1" lints: dependency: transitive description: @@ -652,10 +652,10 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.11.0" mime: dependency: transitive description: @@ -1147,10 +1147,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.6.1" timeago: dependency: "direct main" description: @@ -1275,10 +1275,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "13.0.0" wakelock_plus: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index decab2ae83..e7e90df783 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: font_awesome_flutter: ^10.7.0 google_fonts: ^6.2.1 injectable: ^2.4.0 - intl: 0.19.0 + intl: ^0.18.1 json_annotation: ^4.9.0 language_code: ^0.5.3+2 logcat: From 7004ab2547740198a91c821d7eb305cee70925f5 Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Tue, 28 May 2024 22:37:53 +0700 Subject: [PATCH 2/9] chore: Remove FVM specific settings --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 8a68bfdcdb..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "dart.flutterSdkPath": ".fvm/versions/3.19.6" -} \ No newline at end of file From 380c4e3c2ecb2c8c62280be2d7cd21977f0eca1e Mon Sep 17 00:00:00 2001 From: validcube Date: Sat, 15 Jun 2024 17:01:41 +0700 Subject: [PATCH 3/9] build: Migrate deprecated dependency Signed-off-by: validcube --- android/app/build.gradle | 1 - pubspec.lock | 33 +++++++++++++++++---------------- pubspec.yaml | 5 ++++- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 713cb35b07..7e9a234171 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -24,7 +24,6 @@ if (flutterVersionName == null) { android { compileSdk 34 - ndkVersion "26.1.10909125" compileOptions { coreLibraryDesugaringEnabled true diff --git a/pubspec.lock b/pubspec.lock index fb371e2d4a..0c95943c1c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -571,18 +571,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "2.0.1" + 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: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b" url: "https://pub.dev" source: hosted - version: "1.11.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: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.1" timeago: dependency: "direct main" description: @@ -1275,10 +1276,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.2" wakelock_plus: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index e7e90df783..879e7f8c32 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 From 877a884f45978174c6683b87d2b0233f72b83cae Mon Sep 17 00:00:00 2001 From: validcube Date: Sat, 15 Jun 2024 17:05:02 +0700 Subject: [PATCH 4/9] ci: bump to 3.22.x --- .github/workflows/build_pull_request.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/sync_crowdin.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index f68fd2131d..ad3020f391 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -61,7 +61,7 @@ jobs: uses: subosito/flutter-action@v2 with: channel: "stable" - flutter-version: 3.19.x + 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 f9a1b8da25..c467d13917 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: uses: subosito/flutter-action@v2 with: channel: "stable" - flutter-version: 3.19.x + 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 a9478c2cbc..f86b4792e6 100644 --- a/.github/workflows/sync_crowdin.yml +++ b/.github/workflows/sync_crowdin.yml @@ -24,7 +24,7 @@ jobs: uses: subosito/flutter-action@v2 with: cache: true - flutter-version: 3.19.x + flutter-version: 3.22.x - name: Sync translations from Crowdin uses: crowdin/github-action@v1 From 7e6eb48dc4cb9352ca4b62ad25aff5d000c83a27 Mon Sep 17 00:00:00 2001 From: validcube Date: Sat, 15 Jun 2024 17:05:41 +0700 Subject: [PATCH 5/9] docs: update version --- docs/4_building.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4_building.md b/docs/4_building.md index d1a9cb708a..ac14e3998c 100644 --- a/docs/4_building.md +++ b/docs/4_building.md @@ -2,7 +2,7 @@ Learn how to build ReVanced Manager from source. -1. Setup the Flutter environment for your [platform](https://docs.flutter.dev/get-started/install) with version **3.19.6** +1. Setup the Flutter environment for your [platform](https://docs.flutter.dev/get-started/install) with version **3.22** 2. Clone the repository From 365c0f191f3222447647213a38eb69dcb7f3c747 Mon Sep 17 00:00:00 2001 From: validcube Date: Sat, 15 Jun 2024 17:12:12 +0700 Subject: [PATCH 6/9] build: Update constraint Signed-off-by: validcube --- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 0c95943c1c..3f7dd5eae0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -515,10 +515,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" io: dependency: transitive description: @@ -587,10 +587,10 @@ packages: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" lints: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 879e7f8c32..43ed2f60bd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: font_awesome_flutter: ^10.7.0 google_fonts: ^6.2.1 injectable: ^2.4.0 - intl: ^0.18.1 + intl: 0.19.0 json_annotation: ^4.9.0 language_code: ^0.5.3+2 logcat: From 4cd3739a1bd52791751a17d51901e1039c4c54cd Mon Sep 17 00:00:00 2001 From: validcube Date: Sat, 15 Jun 2024 17:23:45 +0700 Subject: [PATCH 7/9] docs: Use "suggest" instead --- docs/4_building.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4_building.md b/docs/4_building.md index ac14e3998c..756452da7c 100644 --- a/docs/4_building.md +++ b/docs/4_building.md @@ -2,7 +2,7 @@ Learn how to build ReVanced Manager from source. -1. Setup the Flutter environment for your [platform](https://docs.flutter.dev/get-started/install) with version **3.22** +1. Setup the Flutter environment for your [platform](https://docs.flutter.dev/get-started/install) with the suggested version of **v3.22** 2. Clone the repository From 5deae6766ec04788061ba04e881b838e485ca61f Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Sat, 15 Jun 2024 18:04:58 +0700 Subject: [PATCH 8/9] Update build.gradle --- android/app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 7e9a234171..565e9677a2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -24,6 +24,7 @@ if (flutterVersionName == null) { android { compileSdk 34 + ndkVersion flutter.ndkVersion compileOptions { coreLibraryDesugaringEnabled true From 07b4e0d97d662317269efc7a4c8ba637593a9ef3 Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Mon, 24 Jun 2024 23:39:22 +0700 Subject: [PATCH 9/9] Update 4_building.md --- docs/4_building.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4_building.md b/docs/4_building.md index 756452da7c..aa52df882b 100644 --- a/docs/4_building.md +++ b/docs/4_building.md @@ -2,7 +2,7 @@ Learn how to build ReVanced Manager from source. -1. Setup the Flutter environment for your [platform](https://docs.flutter.dev/get-started/install) with the suggested version of **v3.22** +1. Setup the Flutter environment for your [platform](https://docs.flutter.dev/get-started/install) 2. Clone the repository