Skip to content

Commit 40d8e79

Browse files
chore: upgrade to flutter 3.32.0 (#1286)
* chore: upgrade to flutter 3.32.0 * run tool/generate_bundles.sh * fix: lints * fix: format * fix: generate test optimizer bundle * test: first round of test fixes * test: very_good_cli build tests passing * test: add missing cli tests * fix: e2e test stubs * chore(deps): bump pana version * chore: regenerate spdx license * chore: mason make spdx_license * chore: remove erroneous file * fix: spdx license generation * fix: spdx license generation * chore: update dart cli bundle * chore: update flutter plugin bundle * chore: run generators * attempt to fix pana workflow * fix: change pana minimum score --------- Co-authored-by: Alejandro Santiago <[email protected]>
1 parent 06daf69 commit 40d8e79

File tree

97 files changed

+4159
-4038
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+4159
-4038
lines changed

.github/workflows/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
flutter-version:
2828
# The version of Flutter to use should use the minimum Dart SDK version supported by the package,
2929
# refer to https://docs.flutter.dev/development/tools/sdk/releases.
30-
- "3.24.0"
30+
- "3.32.0"
3131
- "3.x"
3232
test:
3333
# E2E tests for the test command

.github/workflows/spdx_license.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: 🎯 Setup Dart
3737
uses: dart-lang/setup-dart@v1
3838
with:
39-
sdk: 3.5.0
39+
sdk: 3.8.0
4040

4141
- name: 📦 Install Dependencies
4242
run: dart pub get
@@ -71,7 +71,7 @@ jobs:
7171
- name: 🎯 Setup Dart
7272
uses: dart-lang/setup-dart@v1
7373
with:
74-
sdk: 3.5.0
74+
sdk: 3.8.0
7575

7676
- name: 📦 Install Dependencies
7777
run: dart pub get

.github/workflows/test_optimizer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
build_hooks:
2323
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
2424
with:
25-
dart_sdk: 3.5.0
25+
dart_sdk: 3.8.0
2626
working_directory: bricks/test_optimizer/hooks
2727

2828
verify_bundle:

.github/workflows/very_good_cli.yaml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- uses: subosito/[email protected]
2727
with:
28-
flutter-version: 3.24.0
28+
flutter-version: 3.32.0
2929

3030
- name: Install Dependencies
3131
run: flutter pub get
@@ -50,21 +50,7 @@ jobs:
5050
exclude: "**/*.gen.dart"
5151

5252
pana:
53-
runs-on: ubuntu-latest
54-
55-
steps:
56-
- uses: actions/checkout@v4
57-
58-
- uses: subosito/[email protected]
59-
60-
- name: Install Dependencies
61-
run: |
62-
flutter packages get
63-
flutter pub global activate pana
64-
65-
- name: Verify Pub Score
66-
run: |
67-
PANA=$(pana . --no-warning); PANA_SCORE=$(echo $PANA | sed -n "s/.*Points: \([0-9]*\)\/\([0-9]*\)./\1\/\2/p")
68-
echo "score: $PANA_SCORE"
69-
IFS='/'; read -a SCORE_ARR <<< "$PANA_SCORE"; SCORE=SCORE_ARR[0]; TOTAL=SCORE_ARR[1]
70-
if (( $SCORE < $TOTAL )); then echo "minimum score not met!"; exit 1; fi
53+
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/pana.yml@v1
54+
with:
55+
min_score: 150 # Update minimum score to 160 once we have the CLI up to date.
56+
pana_version: 0.22.21

analysis_options.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include: package:very_good_analysis/analysis_options.5.1.0.yaml
1+
include: package:very_good_analysis/analysis_options.yaml
22
analyzer:
33
exclude:
44
- "**/version.dart"

bin/very_good.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Future<void> main(List<String> args) async {
1212
/// exited already. This is useful to prevent Future chains from proceeding
1313
/// after you've decided to exit.
1414
Future<void> _flushThenExit(int status) {
15-
return Future.wait<void>([stdout.close(), stderr.close()])
16-
.then<void>((_) => exit(status));
15+
return Future.wait<void>([
16+
stdout.close(),
17+
stderr.close(),
18+
]).then<void>((_) => exit(status));
1719
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include: package:very_good_analysis/analysis_options.7.0.0.yaml
1+
include: package:very_good_analysis/analysis_options.yaml
22
linter:
33
rules:
44
public_member_api_docs: false

bricks/test_optimizer/hooks/lib/pre_gen.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ Future<void> run(HookContext context) async {
3434
final testIdentifierTable = <Map<String, String>>[];
3535
for (final entity
3636
in testDir.listSync(recursive: true).where((entity) => entity.isTest)) {
37-
final relativePath =
38-
path.relative(entity.path, from: testDir.path).replaceAll(r'\', '/');
37+
final relativePath = path
38+
.relative(entity.path, from: testDir.path)
39+
.replaceAll(r'\', '/');
3940
testIdentifierTable.add({
4041
'path': relativePath,
4142
'identifier': identifierGenerator.next(),

bricks/test_optimizer/hooks/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: hooks
22
publish_to: none
33

44
environment:
5-
sdk: ^3.5.0
5+
sdk: ^3.8.0
66

77
dependencies:
88
mason: ^0.1.0
@@ -13,4 +13,4 @@ dependencies:
1313
dev_dependencies:
1414
mocktail: ^1.0.0
1515
test: ^1.25.0
16-
very_good_analysis: ^7.0.0
16+
very_good_analysis: ^9.0.0

bricks/test_optimizer/hooks/test/dart_identifier_generator_test.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,12 @@ void main() {
3434
ids.add(id);
3535
}
3636

37-
expect(
38-
ids.where((id) => _dartReservedKeywords.contains(id)),
39-
isEmpty,
40-
);
37+
expect(ids.where((id) => _dartReservedKeywords.contains(id)), isEmpty);
4138
expect(
4239
ids.every((id) {
4340
final idStart = id.codeUnitAt(0);
44-
final isAlphabetic = (idStart >= 65 && idStart <= 90) ||
41+
final isAlphabetic =
42+
(idStart >= 65 && idStart <= 90) ||
4543
(idStart >= 97 && idStart <= 122);
4644
final isUnderscore = idStart == 95;
4745
final isDollarSign = idStart == 36;

0 commit comments

Comments
 (0)