From a5b6a163cae7c4c1fd692177c1c398aab7be65b4 Mon Sep 17 00:00:00 2001 From: Eli <88557639+lishaduck@users.noreply.github.com> Date: Tue, 7 Jan 2025 20:47:49 -0600 Subject: [PATCH] chore: switch to master channel Awaiting CP (flutter/engine#57246) of flutter/engine#56949 to stable. --- .github/workflows/ci.yaml | 27 +++--- .../lib/analysis_options.yaml | 3 + packages/app/pubspec.lock | 86 +++++++++---------- pubspec.lock | 2 +- pubspec.yaml | 2 +- 5 files changed, 65 insertions(+), 55 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 392cd7e..c9e90a5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,6 +16,8 @@ on: env: CI: true + FLUTTER_CHANNEL: master + FLUTTER_VERSION: "4a4eb2a320" # TODO: Prefer flutter-version-file once back on beta. permissions: contents: read @@ -40,9 +42,10 @@ jobs: set-safe-directory: true - name: 🐦 Set up Flutter id: flutter - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0 + uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # v2.18.0 with: - flutter-version-file: pubspec.yaml + channel: ${{ env.FLUTTER_CHANNEL }} + flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - name: 🌐 Disable analytics run: flutter --disable-analytics @@ -110,9 +113,10 @@ jobs: set-safe-directory: true - name: 🐦 Set up Flutter id: flutter - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0 + uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # v2.18.0 with: - flutter-version-file: pubspec.yaml + channel: ${{ env.FLUTTER_CHANNEL }} + flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - name: ☕ Setup Java if: ${{ matrix.target == 'appbundle' }} @@ -172,9 +176,10 @@ jobs: set-safe-directory: true - name: 🐦 Set up Flutter id: flutter - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0 + uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # v2.18.0 with: - flutter-version-file: pubspec.yaml + channel: ${{ env.FLUTTER_CHANNEL }} + flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - name: 🌐 Disable analytics run: flutter --disable-analytics @@ -218,9 +223,10 @@ jobs: set-safe-directory: true - name: 🐦 Set up Flutter id: flutter - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0 + uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # v2.18.0 with: - flutter-version-file: pubspec.yaml + channel: ${{ env.FLUTTER_CHANNEL }} + flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - name: 🌐 Disable analytics run: flutter --disable-analytics @@ -274,9 +280,10 @@ jobs: set-safe-directory: true - name: 🐦 Set up Flutter id: flutter - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0 + uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # v2.18.0 with: - flutter-version-file: pubspec.yaml + channel: ${{ env.FLUTTER_CHANNEL }} + flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - name: 🌐 Disable analytics run: flutter --disable-analytics diff --git a/packages/analysis_options/lib/analysis_options.yaml b/packages/analysis_options/lib/analysis_options.yaml index 1de3c66..6bc13a3 100644 --- a/packages/analysis_options/lib/analysis_options.yaml +++ b/packages/analysis_options/lib/analysis_options.yaml @@ -10,6 +10,9 @@ include: package:very_good_analysis/analysis_options.yaml analyzer: + errors: + unused_element_parameter: ignore + exclude: - "lib/src/gen/**" - "lib/src/l10n/app_localizations*.dart" diff --git a/packages/app/pubspec.lock b/packages/app/pubspec.lock index 71117fd..69577f8 100644 --- a/packages/app/pubspec.lock +++ b/packages/app/pubspec.lock @@ -73,10 +73,10 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" auto_route: dependency: "direct main" description: @@ -105,10 +105,10 @@ packages: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" build: dependency: transitive description: @@ -209,10 +209,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -257,10 +257,10 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" code_builder: dependency: transitive description: @@ -273,10 +273,10 @@ packages: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" color: dependency: transitive description: @@ -465,10 +465,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: transitive description: @@ -757,10 +757,10 @@ packages: dependency: transitive description: name: image_size_getter - sha256: "0511799498340b70993d2dfb34b55a2247b5b801d75a6cdd4543acfcafdb12b0" + sha256: c769a86b21a2f5ccc6d6a94e16243a1e04004afa15d0960589d6254ce73c82fe url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.0" intl: dependency: "direct main" description: @@ -821,18 +821,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -917,10 +917,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -933,10 +933,10 @@ packages: dependency: "direct main" description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mgrs_dart: dependency: transitive description: @@ -1013,10 +1013,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_parsing: dependency: transitive description: @@ -1370,10 +1370,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sprintf: dependency: transitive description: @@ -1386,10 +1386,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" state_notifier: dependency: transitive description: @@ -1402,10 +1402,10 @@ packages: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "4ac0537115a24d772c408a2520ecd0abb99bca2ea9c4e634ccbdbfae64fe17ec" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" stream_transform: dependency: transitive description: @@ -1418,10 +1418,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" tar: dependency: transitive description: @@ -1434,34 +1434,34 @@ packages: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test: dependency: transitive description: name: test - sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f" + sha256: "8391fbe68d520daf2314121764d38e37f934c02fd7301ad18307bd93bd6b725d" url: "https://pub.dev" source: hosted - version: "1.25.8" + version: "1.25.14" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" test_core: dependency: transitive description: name: test_core - sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d" + sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.8" time: dependency: transitive description: @@ -1626,10 +1626,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.3.1" watcher: dependency: transitive description: @@ -1727,5 +1727,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.6.0 <3.7.0-z" + dart: ">=3.7.0-0 <3.7.0-z" flutter: ">=3.24.0" diff --git a/pubspec.lock b/pubspec.lock index 4feec31..7c1618d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -299,4 +299,4 @@ packages: version: "2.2.2" sdks: dart: ">=3.6.0 <4.0.0" - flutter: ">=3.27.1" + flutter: ">=3.28.0-2.0.pre.38634" diff --git a/pubspec.yaml b/pubspec.yaml index f0ca9cc..0eb6e6c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: "nexus" environment: sdk: ">=3.6.0 <4.0.0" - flutter: "3.27.1" + flutter: "3.28.0-2.0.pre.38634" dev_dependencies: melos: ^6.3.0