From 3d4318eb48190242c70b3e3b9cf1d876afd8b48a Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Fri, 25 Oct 2024 10:54:08 -0700
Subject: [PATCH] os_detect: bump lints and SDK versions

...and other cleanup across the board

- drop deprecated lints
- drop redundant lints
- tiny bump to min test version using --tighten pub command
---
 .github/workflows/os_detect.yaml      | 2 +-
 pkgs/args/analysis_options.yaml       | 2 --
 pkgs/args/pubspec.yaml                | 2 +-
 pkgs/async/analysis_options.yaml      | 1 -
 pkgs/collection/analysis_options.yaml | 1 -
 pkgs/collection/pubspec.yaml          | 2 +-
 pkgs/convert/analysis_options.yaml    | 1 -
 pkgs/crypto/analysis_options.yaml     | 1 -
 pkgs/fixnum/analysis_options.yaml     | 1 -
 pkgs/logging/analysis_options.yaml    | 1 -
 pkgs/logging/pubspec.yaml             | 2 +-
 pkgs/os_detect/CHANGELOG.md           | 4 ++++
 pkgs/os_detect/analysis_options.yaml  | 1 -
 pkgs/os_detect/bin/os_detect.dart     | 2 +-
 pkgs/os_detect/lib/os_detect.dart     | 2 +-
 pkgs/os_detect/pubspec.yaml           | 6 +++---
 pkgs/path/analysis_options.yaml       | 1 -
 pkgs/platform/example/pubspec.yaml    | 2 +-
 pkgs/typed_data/analysis_options.yaml | 1 -
 19 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/os_detect.yaml b/.github/workflows/os_detect.yaml
index be86b67e..5508c8db 100644
--- a/.github/workflows/os_detect.yaml
+++ b/.github/workflows/os_detect.yaml
@@ -56,7 +56,7 @@ jobs:
       matrix:
         # Add macos-latest and/or windows-latest if relevant for this package.
         os: [ubuntu-latest, windows-latest, macos-latest]
-        sdk: [3.0.0, dev]
+        sdk: [3.5, dev]
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
       - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
diff --git a/pkgs/args/analysis_options.yaml b/pkgs/args/analysis_options.yaml
index a96c5ee4..4ea2bd7e 100644
--- a/pkgs/args/analysis_options.yaml
+++ b/pkgs/args/analysis_options.yaml
@@ -10,5 +10,3 @@ linter:
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
     - no_runtimeType_toString
-    - package_api_docs
-    - unnecessary_await_in_return
diff --git a/pkgs/args/pubspec.yaml b/pkgs/args/pubspec.yaml
index 21c9389b..0bf3d94b 100644
--- a/pkgs/args/pubspec.yaml
+++ b/pkgs/args/pubspec.yaml
@@ -13,4 +13,4 @@ environment:
 
 dev_dependencies:
   dart_flutter_team_lints: ^3.0.0
-  test: ^1.16.0
+  test: ^1.16.6
diff --git a/pkgs/async/analysis_options.yaml b/pkgs/async/analysis_options.yaml
index 265204bd..519bd43a 100644
--- a/pkgs/async/analysis_options.yaml
+++ b/pkgs/async/analysis_options.yaml
@@ -18,4 +18,3 @@ linter:
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
     - no_runtimeType_toString
-    - package_api_docs
diff --git a/pkgs/collection/analysis_options.yaml b/pkgs/collection/analysis_options.yaml
index 3321f3b1..74c328a9 100644
--- a/pkgs/collection/analysis_options.yaml
+++ b/pkgs/collection/analysis_options.yaml
@@ -12,5 +12,4 @@ linter:
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
     - no_runtimeType_toString
-    - package_api_docs
     - unnecessary_await_in_return
diff --git a/pkgs/collection/pubspec.yaml b/pkgs/collection/pubspec.yaml
index 54477398..c1b16334 100644
--- a/pkgs/collection/pubspec.yaml
+++ b/pkgs/collection/pubspec.yaml
@@ -13,4 +13,4 @@ environment:
 
 dev_dependencies:
   dart_flutter_team_lints: ^3.0.0
-  test: ^1.16.0
+  test: ^1.16.6
diff --git a/pkgs/convert/analysis_options.yaml b/pkgs/convert/analysis_options.yaml
index 20982383..3b001dd3 100644
--- a/pkgs/convert/analysis_options.yaml
+++ b/pkgs/convert/analysis_options.yaml
@@ -17,7 +17,6 @@ linter:
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
     - no_runtimeType_toString
-    - package_api_docs
     - prefer_const_declarations
     - prefer_expression_function_bodies
     - unnecessary_await_in_return
diff --git a/pkgs/crypto/analysis_options.yaml b/pkgs/crypto/analysis_options.yaml
index 2ca69418..897fc8ab 100644
--- a/pkgs/crypto/analysis_options.yaml
+++ b/pkgs/crypto/analysis_options.yaml
@@ -10,4 +10,3 @@ linter:
   rules:
     - avoid_unused_constructor_parameters
     - cancel_subscriptions
-    - package_api_docs
diff --git a/pkgs/fixnum/analysis_options.yaml b/pkgs/fixnum/analysis_options.yaml
index 50e529cd..e53700b9 100644
--- a/pkgs/fixnum/analysis_options.yaml
+++ b/pkgs/fixnum/analysis_options.yaml
@@ -14,7 +14,6 @@ linter:
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
     - no_runtimeType_toString
-    - package_api_docs
     - prefer_const_declarations
     - prefer_expression_function_bodies
     - unnecessary_raw_strings
diff --git a/pkgs/logging/analysis_options.yaml b/pkgs/logging/analysis_options.yaml
index 7c004e0f..307a6a7c 100644
--- a/pkgs/logging/analysis_options.yaml
+++ b/pkgs/logging/analysis_options.yaml
@@ -20,7 +20,6 @@ linter:
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
     - no_runtimeType_toString
-    - package_api_docs
     - prefer_const_declarations
     - prefer_expression_function_bodies
     - prefer_final_locals
diff --git a/pkgs/logging/pubspec.yaml b/pkgs/logging/pubspec.yaml
index 8fb8a436..f1f33345 100644
--- a/pkgs/logging/pubspec.yaml
+++ b/pkgs/logging/pubspec.yaml
@@ -14,4 +14,4 @@ environment:
 
 dev_dependencies:
   dart_flutter_team_lints: ^3.0.0
-  test: ^1.16.0
+  test: ^1.16.6
diff --git a/pkgs/os_detect/CHANGELOG.md b/pkgs/os_detect/CHANGELOG.md
index 0dea3e5d..9511042f 100644
--- a/pkgs/os_detect/CHANGELOG.md
+++ b/pkgs/os_detect/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.3-wip
+
+- Require Dart 3.5
+
 ## 2.0.2
 
 - Require Dart 3.0
diff --git a/pkgs/os_detect/analysis_options.yaml b/pkgs/os_detect/analysis_options.yaml
index f29baf1b..da317996 100644
--- a/pkgs/os_detect/analysis_options.yaml
+++ b/pkgs/os_detect/analysis_options.yaml
@@ -20,7 +20,6 @@ linter:
   - missing_whitespace_between_adjacent_strings
   - no_adjacent_strings_in_list
   - no_runtimeType_toString
-  - package_api_docs
   - prefer_const_declarations
   - use_raw_strings
 
diff --git a/pkgs/os_detect/bin/os_detect.dart b/pkgs/os_detect/bin/os_detect.dart
index e9e6fc15..d886a4f2 100644
--- a/pkgs/os_detect/bin/os_detect.dart
+++ b/pkgs/os_detect/bin/os_detect.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 /// Prints the operating system detected by the current compilation environment.
-library pkg.os_detect.run;
+library;
 
 import 'package:os_detect/os_detect.dart' as os_detect;
 
diff --git a/pkgs/os_detect/lib/os_detect.dart b/pkgs/os_detect/lib/os_detect.dart
index d323f63a..7279d2fa 100644
--- a/pkgs/os_detect/lib/os_detect.dart
+++ b/pkgs/os_detect/lib/os_detect.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 /// Information about the current operating system.
-library pkg.os_detect;
+library;
 
 import 'src/os_override.dart';
 
diff --git a/pkgs/os_detect/pubspec.yaml b/pkgs/os_detect/pubspec.yaml
index fb927b4c..ecb51ae7 100644
--- a/pkgs/os_detect/pubspec.yaml
+++ b/pkgs/os_detect/pubspec.yaml
@@ -1,14 +1,14 @@
 name: os_detect
-version: 2.0.2
+version: 2.0.3-wip
 description: Platform independent OS detection.
 repository: https://github.com/dart-lang/core/tree/main/pkgs/os_detect
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 dependencies:
   meta: ^1.9.0
 
 dev_dependencies:
-  dart_flutter_team_lints: ^2.0.0
+  dart_flutter_team_lints: ^3.0.0
   test: ^1.24.0
diff --git a/pkgs/path/analysis_options.yaml b/pkgs/path/analysis_options.yaml
index 0b63e947..6c712965 100644
--- a/pkgs/path/analysis_options.yaml
+++ b/pkgs/path/analysis_options.yaml
@@ -9,7 +9,6 @@ linter:
     - join_return_with_assignment
     - missing_whitespace_between_adjacent_strings
     - no_runtimeType_toString
-    - package_api_docs
     - prefer_const_declarations
     - prefer_expression_function_bodies
     - prefer_final_locals
diff --git a/pkgs/platform/example/pubspec.yaml b/pkgs/platform/example/pubspec.yaml
index 35107a7f..fb2f5b03 100644
--- a/pkgs/platform/example/pubspec.yaml
+++ b/pkgs/platform/example/pubspec.yaml
@@ -11,4 +11,4 @@ dependencies:
     path: ../
 
 dev_dependencies:
-  lints: ^4.0.0
+  lints: ^5.0.0
diff --git a/pkgs/typed_data/analysis_options.yaml b/pkgs/typed_data/analysis_options.yaml
index 543787c0..3806e369 100644
--- a/pkgs/typed_data/analysis_options.yaml
+++ b/pkgs/typed_data/analysis_options.yaml
@@ -10,4 +10,3 @@ linter:
     - avoid_unused_constructor_parameters
     - cancel_subscriptions
     - no_adjacent_strings_in_list
-    - package_api_docs