Merge latest stable with master
diff --git a/pkgs/test/CHANGELOG.md b/pkgs/test/CHANGELOG.md
index 9406b97..720fb20 100644
--- a/pkgs/test/CHANGELOG.md
+++ b/pkgs/test/CHANGELOG.md
@@ -25,6 +25,10 @@
`package:test_api/test_api.dart` (and hence through
`package:test_core/test_core.dart` and `package:test/test.dart`).
+## 1.15.4
+
+* Allow analyzer 0.40.x.
+
## 1.15.3
* Update to `matcher` version `0.12.9` which improves the mismatch description
diff --git a/pkgs/test_core/CHANGELOG.md b/pkgs/test_core/CHANGELOG.md
index f389fd3..e75d7c6 100644
--- a/pkgs/test_core/CHANGELOG.md
+++ b/pkgs/test_core/CHANGELOG.md
@@ -23,6 +23,10 @@
* Migrate to null safety.
+## 0.3.11+1
+
+* Allow analyzer 0.40.x.
+
## 0.3.11
* Update to `matcher` version `0.12.9`.