Skip to content

Commit a8b31a2

Browse files
authored
Merge pull request #69 from netglade/dcm-1.27.0
netglade_analysis 16
2 parents ccd8d10 + ce64510 commit a8b31a2

File tree

17 files changed

+40
-17
lines changed

17 files changed

+40
-17
lines changed

.fvm/fvm_config.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

.fvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"flutter": "3.27.1"
2+
"flutter": "3.29.0"
33
}

.github/workflows/ci.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,17 @@ jobs:
3434
- name: Dart Analyze
3535
run: melos run lint:dart
3636

37+
- name: Get DCM version
38+
id: dcm-version
39+
run: |
40+
dcmVersion=$(cat dcm_global.yaml | grep version | cut -d' ' -f2 | sed -r 's/"//g')
41+
echo "DCM_VERSION=$dcmVersion" >> "$GITHUB_OUTPUT"
42+
3743
- name: Install DCM
3844
uses: CQLabs/setup-dcm@v2
3945
with:
4046
github-token: ${{ secrets.GITHUB_TOKEN }}
41-
version: 1.26.2
47+
version: ${{ steps.dcm-version.outputs.DCM_VERSION }}
4248

4349
- name: Run DCM
4450
uses: CQLabs/dcm-action@v2

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"dart.flutterSdkPath": ".fvm/versions/3.27.1",
2+
"dart.flutterSdkPath": ".fvm/versions/3.29.0",
33
"search.exclude": {
44
"**/.fvm": true,
55
"**/*.g.dart": true

dcm_global.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: "1.26.2"
1+
version: "1.27.1"

packages/netglade_analysis/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 16.0.0
2+
- Adhere to DCM 1.27.0:
3+
- Add prefer-redirecting-superclass-constructor
4+
- Add prefer-expect-later
5+
- Add avoid-nested-try-statements
6+
- Add avoid-unnecessary-block
7+
- Remove prefer_adjacent_string_concatenation from Dart lints
8+
19
## 15.0.0
210
- Adhere to DCM 1.26.0:
311
- Add avoid-commented-out-code

packages/netglade_analysis/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 NetGlade
3+
Copyright (c) 2025 NetGlade
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

packages/netglade_analysis/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To use the lints, add as a dev dependency in your `pubspec.yaml`:
2323

2424
```yaml
2525
dev_dependencies:
26-
netglade_analysis: ^15.0.0
26+
netglade_analysis: ^16.0.0
2727
```
2828
2929
Then, add an include in `analysis_options.yaml`:

packages/netglade_analysis/example/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ publish_to: none
44

55
environment:
66
sdk: ">=3.6.0 <4.0.0"
7+
resolution: workspace
78

89
dependencies:
910
netglade_analysis:

packages/netglade_analysis/lib/dcm.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# version 1.25.0 - https://dcm.dev/changelog
1+
# version 1.27.0 - https://dcm.dev/changelog
22
dart_code_metrics:
33
rules:
44
### Common
@@ -74,6 +74,7 @@ dart_code_metrics:
7474
- context.read
7575
- context.watch
7676
- GetIt.I
77+
- Get.find
7778
- avoid-inverted-boolean-checks
7879
- avoid-keywords-in-wildcard-pattern
7980
# - avoid-late-keyword
@@ -103,6 +104,8 @@ dart_code_metrics:
103104
- avoid-nested-streams-and-futures
104105
- avoid-nested-switch-expressions
105106
- avoid-nested-switches
107+
- avoid-nested-try-statements:
108+
acceptable-level: 2
106109
- avoid-non-ascii-symbols:
107110
exclude:
108111
- test/**
@@ -155,6 +158,7 @@ dart_code_metrics:
155158
- avoid-uncaught-future-errors
156159
- avoid-unconditional-break
157160
- avoid-unknown-pragma
161+
- avoid-unnecessary-block
158162
- avoid-unnecessary-call
159163
- avoid-unnecessary-collections
160164
- avoid-unnecessary-conditionals
@@ -334,6 +338,7 @@ dart_code_metrics:
334338
- prefer-declaring-const-constructor
335339
- prefer-early-return
336340
- prefer-enums-by-name
341+
- prefer-expect-later
337342
- prefer-explicit-function-type
338343
- prefer-explicit-parameter-names
339344
# - prefer-explicit-type-arguments # inference is better
@@ -365,6 +370,7 @@ dart_code_metrics:
365370
# - prefer-prefixed-global-constants # * OK, we just don't have global config
366371
- prefer-private-extension-type-field
367372
- prefer-public-exception-classes
373+
- prefer-redirecting-superclass-constructor
368374
- prefer-return-await
369375
# - prefer-returning-conditional-expressions # annoying sometimes
370376
- prefer-simpler-boolean-expressions

packages/netglade_analysis/lib/lints.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ linter:
148148
# - package_api_docs
149149
- package_prefixed_library_names
150150
- parameter_assignments
151-
- prefer_adjacent_string_concatenation
151+
# - prefer_adjacent_string_concatenation # we don't like adjacent strings
152152
- prefer_asserts_in_initializer_lists
153153
- prefer_asserts_with_message
154154
- prefer_collection_literals

packages/netglade_analysis/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: netglade_analysis
2-
version: 15.0.0
2+
version: 16.0.0
33
description: Lint rules for Dart and Flutter used internally at netglade.
44
repository: https://github.com/netglade/flutter_core/tree/main/packages/netglade_analysis
55
issue_tracker: https://github.com/netglade/flutter_core/issues

packages/netglade_flutter_utils/example/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ publish_to: none
55
environment:
66
sdk: ^3.6.0
77
flutter: ">=3.27.1"
8+
resolution: workspace
89

910
dependencies:
1011
flutter:
1112
sdk: flutter
12-
netglade_analysis: ^15.0.0
13+
netglade_analysis: ^16.0.0
1314
netglade_flutter_utils:
1415
path: ..
1516

packages/netglade_flutter_utils/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dev_dependencies:
2020
flutter_test:
2121
sdk: flutter
2222
mocktail: ^1.0.0
23-
netglade_analysis: ^15.0.0
23+
netglade_analysis: ^16.0.0
2424
test: ^1.25.8
2525

2626
flutter:

packages/netglade_utils/example/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ publish_to: none
44

55
environment:
66
sdk: ^3.6.0
7+
resolution: workspace
78

89
dependencies:
9-
netglade_analysis: ^15.0.0
10+
netglade_analysis: ^16.0.0
1011
netglade_utils:
1112
path: ..

packages/netglade_utils/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ dependencies:
1818
mocktail: ^1.0.0
1919

2020
dev_dependencies:
21-
netglade_analysis: ^15.0.0
21+
netglade_analysis: ^16.0.0
2222
test: ^1.25.2

pubspec.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ environment:
55
sdk: ^3.6.0
66
workspace:
77
- packages/netglade_analysis
8+
- packages/netglade_analysis/example
89
- packages/netglade_flutter_utils
10+
- packages/netglade_flutter_utils/example
911
- packages/netglade_utils
12+
- packages/netglade_utils/example
1013

1114
dev_dependencies:
12-
melos: ^7.0.0-dev.3
15+
melos: ^7.0.0-dev.7
1316

1417
melos:
1518
scripts:

0 commit comments

Comments
 (0)