Update dependencies across all packages, require Dart 2.17 (#290)

kevmoo · web-flow · commit f18dd014c01a · 2022-09-14T08:00:36.000-07:00
Allows us to use pkg:lints v2
Cleaned up now redundant lints
Bumped pkg:shelf_router_generator to latest analyzer
Regenerated CI script
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -11,17 +11,12 @@ linter:
     - always_declare_return_types
     - avoid_unused_constructor_parameters
     - cancel_subscriptions
-    - depend_on_referenced_packages
     - directives_ordering
-    - library_private_types_in_public_api
     - lines_longer_than_80_chars
     - literal_only_boolean_expressions
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
-    - no_leading_underscores_for_library_prefixes
-    - no_leading_underscores_for_local_identifiers
     - no_runtimeType_toString
-    - null_check_on_nullable_type_parameter
     - omit_local_variable_types
     - package_api_docs
     - prefer_relative_imports
@@ -31,9 +26,5 @@ linter:
     - type_annotate_public_apis
     - unawaited_futures
     - unnecessary_await_in_return
-    - unnecessary_constructor_name
     - unnecessary_lambdas
-    - unnecessary_late
-    - unnecessary_null_aware_assignments
-    - unnecessary_nullable_for_final_variable_declarations
     - use_super_parameters
diff --git a/pkgs/shelf/CHANGELOG.md b/pkgs/shelf/CHANGELOG.md
@@ -3,6 +3,7 @@
 * Add Response.unauthorized() constructor
 * Add `poweredByHeader` argument to `serve`, `serveRequests`, and
   `handleRequest`.
+* Require Dart >= 2.17
 
 ## 1.3.2
 
diff --git a/pkgs/shelf/lib/src/shelf_unmodifiable_map.dart b/pkgs/shelf/lib/src/shelf_unmodifiable_map.dart
@@ -47,8 +47,7 @@ class ShelfUnmodifiableMap extends UnmodifiableMapView<String, Object> {
   /// Returns an empty [ShelfUnmodifiableMap].
   const factory ShelfUnmodifiableMap.empty() = _EmptyShelfUnmodifiableMap;
 
-  ShelfUnmodifiableMap._(Map<String, Object> source, this._ignoreKeyCase)
-      : super(source);
+  ShelfUnmodifiableMap._(super.source, this._ignoreKeyCase);
 }
 
 /// A const implementation of an empty [ShelfUnmodifiableMap].
diff --git a/pkgs/shelf/mono_pkg.yaml b/pkgs/shelf/mono_pkg.yaml
@@ -1,5 +1,5 @@
 sdk:
-- 2.16.0
+- pubspec
 - dev
 
 stages:
diff --git a/pkgs/shelf/pubspec.yaml b/pkgs/shelf/pubspec.yaml
@@ -4,7 +4,7 @@ description: >
   A model for web server middleware that encourages composition and easy reuse.
 repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf
 environment:
-  sdk: ">=2.16.0 <3.0.0"
+  sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
   async: ^2.5.0
@@ -16,5 +16,5 @@ dependencies:
 
 dev_dependencies:
   http: ^0.13.0
-  lints: ^1.0.0
+  lints: ^2.0.0
   test: ^1.16.0
diff --git a/pkgs/shelf/test/message_test.dart b/pkgs/shelf/test/message_test.dart
@@ -12,8 +12,8 @@ import 'test_util.dart';
 
 class _TestMessage extends Message {
   _TestMessage(Map<String, /* String | List<String> */ Object>? headers,
-      Map<String, Object>? context, Object? body, Encoding? encoding)
-      : super(body, headers: headers, context: context, encoding: encoding);
+      Map<String, Object>? context, super.body, Encoding? encoding)
+      : super(headers: headers, context: context, encoding: encoding);
 
   @override
   Message change(
diff --git a/pkgs/shelf_packages_handler/CHANGELOG.md b/pkgs/shelf_packages_handler/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.2-dev
+
+* Require Dart `2.17`.
+
 ## 3.0.1
 
 * Require Dart `2.14`.
diff --git a/pkgs/shelf_packages_handler/pubspec.yaml b/pkgs/shelf_packages_handler/pubspec.yaml
@@ -1,16 +1,16 @@
 name: shelf_packages_handler
-version: 3.0.1
+version: 3.0.2-dev
 description: A shelf handler for serving a `packages/` directory.
 repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_packages_handler
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
   path: ^1.8.0
   shelf: ^1.0.0
   shelf_static: ^1.0.0
 
 dev_dependencies:
-  lints: ^1.0.0
+  lints: ^2.0.0
   test: ^1.16.0
diff --git a/pkgs/shelf_proxy/CHANGELOG.md b/pkgs/shelf_proxy/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.3-dev
+
+* Require Dart `2.17`.
+
 ## 1.0.2
 
 * Update the pubspec `repository` field.
diff --git a/pkgs/shelf_proxy/pubspec.yaml b/pkgs/shelf_proxy/pubspec.yaml
@@ -1,16 +1,16 @@
 name: shelf_proxy
-version: 1.0.2
+version: 1.0.3-dev
 description: A shelf handler for proxying HTTP requests to another server.
 repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_proxy
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
   http: ^0.13.0
   path: ^1.8.0
   shelf: ^1.0.0
 
 dev_dependencies:
-  lints: ^1.0.0
+  lints: ^2.0.0
   test: ^1.6.0
diff --git a/pkgs/shelf_router/CHANGELOG.md b/pkgs/shelf_router/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## 1.1.4-dev
 
 * Fix spelling in pubspec
-* Require Dart >=2.14
+* Require Dart >=2.17
 
 ## 1.1.3
 
diff --git a/pkgs/shelf_router/lib/src/router.dart b/pkgs/shelf_router/lib/src/router.dart
@@ -156,15 +156,15 @@ class Router {
     // first slash is always in request.handlerPath
     final path = prefix.substring(1);
     if (prefix.endsWith('/')) {
-      all(prefix + '<path|[^]*>', (Request request) {
+      all('$prefix<path|[^]*>', (Request request) {
         return handler(request.change(path: path));
       });
     } else {
       all(prefix, (Request request) {
         return handler(request.change(path: path));
       });
-      all(prefix + '/<path|[^]*>', (Request request) {
-        return handler(request.change(path: path + '/'));
+      all('$prefix/<path|[^]*>', (Request request) {
+        return handler(request.change(path: '$path/'));
       });
     }
   }
@@ -179,7 +179,7 @@ class Router {
       if (route.verb != request.method.toUpperCase() && route.verb != 'ALL') {
         continue;
       }
-      var params = route.match('/' + request.url.path);
+      var params = route.match('/${request.url.path}');
       if (params != null) {
         final response = await route.invoke(request, params);
         if (response != routeNotFound) {
diff --git a/pkgs/shelf_router/pubspec.yaml b/pkgs/shelf_router/pubspec.yaml
@@ -6,7 +6,7 @@ description: >
 repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_router
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
   meta: ^1.3.0
@@ -15,5 +15,5 @@ dependencies:
 
 dev_dependencies:
   test: ^1.16.0
-  lints: ^1.0.0
+  lints: ^2.0.0
   http: ^0.13.0
diff --git a/pkgs/shelf_router_generator/CHANGELOG.md b/pkgs/shelf_router_generator/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## v1.0.5-dev
 
-* Require Dart >=2.14
+* Require `analyzer: '>=4.6.0 <6.0.0'`
+* Require `sdk: '>=2.17.0 <3.0.0'`
 
 ## v1.0.4
 
diff --git a/pkgs/shelf_router_generator/pubspec.yaml b/pkgs/shelf_router_generator/pubspec.yaml
@@ -6,10 +6,10 @@ description: >
 repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_router_generator
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
-  analyzer: '>=2.0.0 <5.0.0'
+  analyzer: '>=4.6.0 <6.0.0'
   build: ^2.0.0
   build_config: ^1.0.0
   code_builder: ^4.0.0
@@ -22,5 +22,5 @@ dev_dependencies:
   build_runner: ^2.0.0
   build_verify: ^3.0.0
   http: ^0.13.0
-  lints: ^1.0.0
+  lints: ^2.0.0
   test: ^1.5.3
diff --git a/pkgs/shelf_static/CHANGELOG.md b/pkgs/shelf_static/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.2-dev
+
+* Require Dart `2.17`.
+
 ## 1.1.1
 
 * Require Dart `2.14`.
diff --git a/pkgs/shelf_static/pubspec.yaml b/pkgs/shelf_static/pubspec.yaml
@@ -1,10 +1,10 @@
 name: shelf_static
-version: 1.1.1
+version: 1.1.2-dev
 description: Static file server support for the shelf package and ecosystem.
 repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_static
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
   convert: ^3.0.0
@@ -16,6 +16,6 @@ dependencies:
 
 dev_dependencies:
   args: ^2.0.0
-  lints: ^1.0.0
+  lints: ^2.0.0
   test: ^1.16.0
   test_descriptor: ^2.0.0
diff --git a/pkgs/shelf_test_handler/CHANGELOG.md b/pkgs/shelf_test_handler/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2-dev
+
+* Require Dart `2.17`.
+
 ## 2.0.1
 
 * Require Dart `2.14`.
diff --git a/pkgs/shelf_test_handler/pubspec.yaml b/pkgs/shelf_test_handler/pubspec.yaml
@@ -1,10 +1,10 @@
 name: shelf_test_handler
-version: 2.0.1
+version: 2.0.2-dev
 description: A Shelf handler that makes it easy to test HTTP interactions.
 repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_test_handler
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
   http_multi_server: ^3.0.0
@@ -13,6 +13,6 @@ dependencies:
 
 dev_dependencies:
   http: ^0.13.0
-  lints: ^1.0.0
+  lints: ^2.0.0
   shelf_web_socket: ^1.0.0
   web_socket_channel: ^2.0.0
diff --git a/pkgs/shelf_web_socket/CHANGELOG.md b/pkgs/shelf_web_socket/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.3-dev
+
+* Require Dart `2.17`.
+
 ## 1.0.2
 
 * Require Dart `2.14`.
diff --git a/pkgs/shelf_web_socket/pubspec.yaml b/pkgs/shelf_web_socket/pubspec.yaml
@@ -1,11 +1,11 @@
 name: shelf_web_socket
-version: 1.0.2
+version: 1.0.3-dev
 description: >
   A shelf handler that wires up a listener for every connection.
 repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_web_socket
 
 environment:
-  sdk: ">=2.14.0 <3.0.0"
+  sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
   shelf: ^1.1.0
@@ -14,5 +14,5 @@ dependencies:
 
 dev_dependencies:
   http: ^0.13.0
-  lints: ^1.0.0
+  lints: ^2.0.0
   test: ^1.16.0

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ class ShelfUnmodifiableMap extends UnmodifiableMapView<String, Object> {`
`47`	`47`	`/// Returns an empty [ShelfUnmodifiableMap].`
`48`	`48`	`const factory ShelfUnmodifiableMap.empty() = _EmptyShelfUnmodifiableMap;`
`49`	`49`
`50`		`- ShelfUnmodifiableMap._(Map<String, Object> source, this._ignoreKeyCase)`
`51`		`- : super(source);`
	`50`	`+ ShelfUnmodifiableMap._(super.source, this._ignoreKeyCase);`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`/// A const implementation of an empty [ShelfUnmodifiableMap].`
-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 sdk:
 -- 2.16.0
 +- pubspec
 - dev
 stages: