From 60e5f5acd4e940a3efb00637ac9211994f551bf2 Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Wed, 13 Dec 2023 11:20:30 -0800
Subject: [PATCH] Update test_api dependency, bump & fix lints, prepare release

Closes https://github.com/dart-lang/matcher/pull/236
---
 .github/workflows/ci.yml |  2 +-
 CHANGELOG.md             |  4 +++-
 analysis_options.yaml    |  2 --
 lib/matcher.dart         |  2 ++
 pubspec.yaml             | 12 ++++++------
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9997eef..353e7b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
       matrix:
         # Add macos-latest and/or windows-latest if relevant for this package.
         os: [ubuntu-latest]
-        sdk: [2.18.0, dev]
+        sdk: [3.0, dev]
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 179f557..9ad3b4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
-## 0.12.17-wip
+## 0.12.17
+
+* Require Dart 3.0
 
 ## 0.12.16
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 217fb64..f0f137f 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -4,8 +4,6 @@ linter:
   rules:
     - always_declare_return_types
     - avoid_private_typedef_functions
-    - avoid_returning_null
-    - avoid_returning_null_for_future
     - avoid_unused_constructor_parameters
     - cancel_subscriptions
     - comment_references
diff --git a/lib/matcher.dart b/lib/matcher.dart
index 72918aa..236d6f4 100644
--- a/lib/matcher.dart
+++ b/lib/matcher.dart
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 /// Support for specifying test expectations, such as for unit tests.
+library;
+
 export 'src/core_matchers.dart';
 export 'src/custom_matcher.dart';
 export 'src/description.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 3979a07..0c0d4b6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,25 +1,25 @@
 name: matcher
-version: 0.12.17-wip
+version: 0.12.17
 description: >-
   Support for specifying test expectations via an extensible Matcher class.
   Also includes a number of built-in Matcher implementations for common cases.
 repository: https://github.com/dart-lang/matcher
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ^3.0.0
 
 dependencies:
   async: ^2.10.0
   meta: ^1.8.0
   stack_trace: ^1.10.0
   term_glyph: ^1.2.0
-  test_api: ">=0.5.0 <0.7.0"
+  test_api: ">=0.5.0 <0.8.0"
 
 dev_dependencies:
   fake_async: ^1.3.0
-  lints: ^2.0.0
+  lints: ^3.0.0
   test: ^1.23.0
 
 dependency_overrides:
-  test: 1.24.2
-  test_api: 0.5.2
+  test: 1.25.0
+  test_api: 0.7.0