Require Dart 3, update lints (#669)

Author: kevmoo

.github/workflows/dart.yml

@@ -1,4 +1,4 @@
-# Created with package:mono_repo v6.5.4
+# Created with package:mono_repo v6.5.7
 name: Dart CI
 on:
   push:
@@ -36,27 +36,27 @@ jobs:
         name: Checkout repository
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
       - name: mono_repo self validate
-        run: dart pub global activate mono_repo 6.5.4
+        run: dart pub global activate mono_repo 6.5.7
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyze_format; linux; Dart 2.18.0; PKG: source_gen; `dart analyze`"
+    name: "analyze_format; linux; Dart 3.0.0; PKG: source_gen; `dart analyze`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:source_gen;commands:analyze_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:source_gen;commands:analyze_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:source_gen
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:source_gen
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
         with:
-          sdk: "2.18.0"
+          sdk: "3.0.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
@@ -143,23 +143,23 @@ jobs:
         if: "always() && steps.source_gen_pub_upgrade.conclusion == 'success'"
         working-directory: source_gen
   job_004:
-    name: "unit_test; linux; Dart 2.18.0; PKG: example_usage; `dart test --run-skipped`"
+    name: "unit_test; linux; Dart 3.0.0; PKG: example_usage; `dart test --run-skipped`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:example_usage;commands:test_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:example_usage;commands:test_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:example_usage
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:example_usage
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
         with:
-          sdk: "2.18.0"
+          sdk: "3.0.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
@@ -177,23 +177,23 @@ jobs:
       - job_002
       - job_003
   job_005:
-    name: "unit_test; linux; Dart 2.18.0; PKG: source_gen; `dart test`"
+    name: "unit_test; linux; Dart 3.0.0; PKG: source_gen; `dart test`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:source_gen;commands:test_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:source_gen;commands:test_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0;packages:source_gen
-            os:ubuntu-latest;pub-cache-hosted;sdk:2.18.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:source_gen
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
         with:
-          sdk: "2.18.0"
+          sdk: "3.0.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
@@ -279,13 +279,13 @@ jobs:
       - job_002
       - job_003
   job_008:
-    name: "unit_test; windows; Dart 2.18.0; PKG: source_gen; `dart test`"
+    name: "unit_test; windows; Dart 3.0.0; PKG: source_gen; `dart test`"
     runs-on: windows-latest
     steps:
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
         with:
-          sdk: "2.18.0"
+          sdk: "3.0.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab

_test_annotations/pubspec.yaml

@@ -2,7 +2,7 @@ name: _test_annotations
 publish_to: none
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: ^3.0.0
 
 dev_dependencies:
-  lints: ^2.0.0
+  dart_flutter_team_lints: ^1.0.0

analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:lints/recommended.yaml
+include: package:dart_flutter_team_lints/analysis_options.yaml
 
 analyzer:
   language:
@@ -8,11 +8,8 @@ analyzer:
 
 linter:
   rules:
-    - always_declare_return_types
     - avoid_bool_literals_in_conditional_expressions
-    - avoid_catching_errors
     - avoid_classes_with_only_static_members
-    - avoid_dynamic_calls
     - avoid_private_typedef_functions
     - avoid_redundant_argument_values
     - avoid_returning_null
@@ -22,44 +19,22 @@ linter:
     - avoid_void_async
     - cancel_subscriptions
     - cascade_invocations
-    - collection_methods_unrelated_type
-    - combinators_ordering
     - comment_references
-    - dangling_library_doc_comments
-    - directives_ordering
-    - implicit_call_tearoffs
     - join_return_with_assignment
-    - library_annotations
-    - lines_longer_than_80_chars
     - literal_only_boolean_expressions
     - missing_whitespace_between_adjacent_strings
     - no_runtimeType_toString
-    - omit_local_variable_types
-    - only_throw_errors
     - package_api_docs
-    - prefer_asserts_in_initializer_lists
     - prefer_const_constructors
     - prefer_const_declarations
     - prefer_expression_function_bodies
     - prefer_final_locals
     - prefer_relative_imports
-    - prefer_single_quotes
     - require_trailing_commas
     - sort_child_properties_last
-    - sort_pub_dependencies
     - test_types_in_equals
-    - throw_in_finally
-    - type_annotate_public_apis
-    - unawaited_futures
     - unnecessary_await_in_return
-    - unnecessary_lambdas
-    - unnecessary_library_directive
-    - unnecessary_parenthesis
-    - unnecessary_statements
-    - unreachable_from_main
     - unsafe_html
     - use_full_hex_values_for_flutter_colors
-    - use_is_even_rather_than_modulo
     - use_string_buffers
-    - use_string_in_part_of_directives
     - use_super_parameters

example/pubspec.yaml

@@ -2,15 +2,15 @@ name: source_gen_example
 publish_to: none
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ^3.0.0
 
 dependencies:
   analyzer: '>=4.6.0 <6.0.0'
   build: ^2.0.0
   source_gen: any
 
 dev_dependencies:
-  lints: ^2.0.0
+  dart_flutter_team_lints: ^1.0.0
 
 dependency_overrides:
   source_gen:

example_usage/pubspec.yaml

@@ -2,7 +2,7 @@ name: source_gen_example_usage
 publish_to: none
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: ^3.0.0
 
 dependencies:
   source_gen_example:
@@ -11,7 +11,7 @@ dependencies:
 dev_dependencies:
   build_runner: ^2.0.0
   build_verify: ^3.0.0
-  lints: ^2.0.0
+  dart_flutter_team_lints: ^1.0.0
   test: ^1.5.1
 
 dependency_overrides:

source_gen/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.3-wip
+
+- Require Dart 3.0
+
 ## 1.3.2
 
 * Make `TypeChecker.isAssignableFromType()` null safe.

source_gen/lib/src/library.dart

@@ -98,10 +98,7 @@ class LibraryReader {
   /// * `asset`
   ///
   /// May throw [ArgumentError] if it is not possible to resolve a path.
-  Uri pathToUrl(dynamic toUrlOrString) {
-    if (toUrlOrString == null) {
-      throw ArgumentError.notNull('toUrlOrString');
-    }
+  Uri pathToUrl(Object toUrlOrString) {
     final to = toUrlOrString is Uri
         ? toUrlOrString
         : Uri.parse(toUrlOrString as String);

source_gen/lib/src/utils.dart

@@ -64,18 +64,12 @@ String urlOfElement(Element element) => element.kind == ElementKind.DYNAMIC
         .replace(fragment: element.name)
         .toString();
 
-Uri normalizeUrl(Uri url) {
-  switch (url.scheme) {
-    case 'dart':
-      return normalizeDartUrl(url);
-    case 'package':
-      return packageToAssetUrl(url);
-    case 'file':
-      return fileToAssetUrl(url);
-    default:
-      return url;
-  }
-}
+Uri normalizeUrl(Uri url) => switch (url.scheme) {
+      'dart' => normalizeDartUrl(url),
+      'package' => _packageToAssetUrl(url),
+      'file' => _fileToAssetUrl(url),
+      _ => url
+    };
 
 /// Make `dart:`-type URLs look like a user-knowable path.
 ///
@@ -87,7 +81,7 @@ Uri normalizeDartUrl(Uri url) => url.pathSegments.isNotEmpty
     ? url.replace(pathSegments: url.pathSegments.take(1))
     : url;
 
-Uri fileToAssetUrl(Uri url) {
+Uri _fileToAssetUrl(Uri url) {
   if (!p.isWithin(p.url.current, url.path)) return url;
   return Uri(
     scheme: 'asset',
@@ -103,7 +97,7 @@ Uri fileToAssetUrl(Uri url) {
 ///
 /// For example, this transforms `package:source_gen/source_gen.dart` into:
 /// `asset:source_gen/lib/source_gen.dart`.
-Uri packageToAssetUrl(Uri url) => url.scheme == 'package'
+Uri _packageToAssetUrl(Uri url) => url.scheme == 'package'
     ? url.replace(
         scheme: 'asset',
         pathSegments: <String>[

source_gen/pubspec.yaml

@@ -1,11 +1,11 @@
 name: source_gen
-version: 1.3.2
+version: 1.3.3-wip
 description: >-
   Source code generation builders and utilities for the Dart build system
 repository: https://github.com/dart-lang/source_gen/tree/master/source_gen
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: ^3.0.0
 
 dependencies:
   analyzer: ^5.2.0
@@ -21,6 +21,6 @@ dev_dependencies:
   _test_annotations:
     path: ../_test_annotations
   build_test: ^2.0.0
-  lints: ^2.0.0
+  dart_flutter_team_lints: ^1.0.0
   term_glyph: ^1.2.0
   test: ^1.16.0

tool/ci.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Created with package:mono_repo v6.5.4
+# Created with package:mono_repo v6.5.7
 
 # Support built in commands on windows out of the box.
 # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")