Update dart_flutter_team_lints to depend on lints v4 (#263)

* Update dart_flutter_team_lints to depend on lints v4 * Update other SDK constraints
dart-lang · May 10, 2024 · 5890417 · 5890417
1 parent 9ce560b
commit 5890417
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 50 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
diff --git a/pkgs/blast_repo/pubspec.yaml b/pkgs/blast_repo/pubspec.yaml
@@ -4,7 +4,7 @@ description: A tool to bulk validate and fix GitHub repos.
 publish_to: none
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 dependencies:
   args: ^2.3.1

diff --git a/pkgs/corpus/pubspec.yaml b/pkgs/corpus/pubspec.yaml
@@ -4,7 +4,7 @@ description: A tool to calculate the API usage for a package.
 publish_to: none
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 dependencies:
   analyzer: ^6.0.0

diff --git a/pkgs/dart_flutter_team_lints/CHANGELOG.md b/pkgs/dart_flutter_team_lints/CHANGELOG.md
@@ -1,4 +1,8 @@
-## 2.1.2-wip
+## 3.0.0
+
+- Depend on the `4.0.0` release of `package:lints` adding
+  the `no_wildcard_variable_uses` lint.
+- Require Dart `3.1.0` or later.
 
 ## 2.1.1
 

diff --git a/pkgs/dart_flutter_team_lints/lib/analysis_options.yaml b/pkgs/dart_flutter_team_lints/lib/analysis_options.yaml
@@ -25,7 +25,6 @@ linter:
     # consistency
     - combinators_ordering
     - directives_ordering
-    - library_annotations
     - lines_longer_than_80_chars
     - omit_local_variable_types
     - prefer_asserts_in_initializer_lists

diff --git a/pkgs/dart_flutter_team_lints/pubspec.yaml b/pkgs/dart_flutter_team_lints/pubspec.yaml
@@ -1,13 +1,13 @@
 name: dart_flutter_team_lints
 description: An analysis rule set used by the Dart and Flutter teams.
-version: 2.1.2-wip
+version: 3.0.0
 repository: https://github.com/dart-lang/ecosystem/tree/main/pkgs/dart_flutter_team_lints
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 dependencies:
-  lints: ^3.0.0
+  lints: ^4.0.0
 
 dev_dependencies:
   checks: ^0.3.0

diff --git a/pkgs/firehose/pubspec.yaml b/pkgs/firehose/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.9.0
 repository: https://github.com/dart-lang/ecosystem/tree/main/pkgs/firehose
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 executables:
   firehose: firehose

diff --git a/pkgs/firehose/test_data/base_test_repo/pkgs/package1/pubspec.yaml b/pkgs/firehose/test_data/base_test_repo/pkgs/package1/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 # repository: https://github.com/my_org/my_repo
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 # Add regular dependencies here.
 dependencies:

diff --git a/pkgs/firehose/test_data/base_test_repo/pkgs/package2/pubspec.yaml b/pkgs/firehose/test_data/base_test_repo/pkgs/package2/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 # repository: https://github.com/my_org/my_repo
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 # Add regular dependencies here.
 dependencies:

diff --git a/pkgs/firehose/test_data/base_test_repo/pkgs/package3/pubspec.yaml b/pkgs/firehose/test_data/base_test_repo/pkgs/package3/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 # repository: https://github.com/my_org/my_repo
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 # Add regular dependencies here.
 dependencies:

diff --git a/pkgs/firehose/test_data/base_test_repo/pkgs/package5/pubspec.yaml b/pkgs/firehose/test_data/base_test_repo/pkgs/package5/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 # repository: https://github.com/my_org/my_repo
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 # Add regular dependencies here.
 dependencies:

diff --git a/pkgs/firehose/test_data/test_repo/pkgs/package1/pubspec.yaml b/pkgs/firehose/test_data/test_repo/pkgs/package1/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 # repository: https://github.com/my_org/my_repo
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 # Add regular dependencies here.
 dependencies:

diff --git a/pkgs/firehose/test_data/test_repo/pkgs/package2/pubspec.yaml b/pkgs/firehose/test_data/test_repo/pkgs/package2/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 # repository: https://github.com/my_org/my_repo
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 # Add regular dependencies here.
 dependencies:

diff --git a/pkgs/firehose/test_data/test_repo/pkgs/package3/pubspec.yaml b/pkgs/firehose/test_data/test_repo/pkgs/package3/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 # repository: https://github.com/my_org/my_repo
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 # Add regular dependencies here.
 dependencies:

diff --git a/pkgs/firehose/test_data/test_repo/pkgs/package5/pubspec.yaml b/pkgs/firehose/test_data/test_repo/pkgs/package5/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.2.0
 # repository: https://github.com/my_org/my_repo
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 # Add regular dependencies here.
 dependencies:

diff --git a/pkgs/repo_manage/pubspec.yaml b/pkgs/repo_manage/pubspec.yaml
@@ -4,7 +4,7 @@ description: Miscellaneous issue, repo, and PR query tools.
 publish_to: none
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0
 
 dependencies:
   args: ^2.4.0

diff --git a/tool/ci.sh b/tool/ci.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
-# Created with package:mono_repo v6.6.0
+# Created with package:mono_repo v6.6.1
 
 # Support built in commands on windows out of the box.
+
 # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")
-# then "flutter" is called instead of "pub".
+# then "flutter pub" is called instead of "dart pub".
 # This assumes that the Flutter SDK has been installed in a previous step.
 function pub() {
   if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then
@@ -12,18 +13,13 @@ function pub() {
     command dart pub "$@"
   fi
 }
-# When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")
-# then "flutter" is called instead of "pub".
-# This assumes that the Flutter SDK has been installed in a previous step.
+
 function format() {
-  if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then
-    command flutter format "$@"
-  else
-    command dart format "$@"
-  fi
+  command dart format "$@"
 }
+
 # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")
-# then "flutter" is called instead of "pub".
+# then "flutter analyze" is called instead of "dart analyze".
 # This assumes that the Flutter SDK has been installed in a previous step.
 function analyze() {
   if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then