Version 2.2.1-dev.3.0
Merge commit '3a93cf9464cb2e664eb3802518fe8e824a09e1f1' into dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea0a3b6..29f220f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,4 @@
-## 2.2.1-dev.XX.0
-(Add new changes here, and they will be copied to the change section for the
- next dev version)
-
-### Language
+## 2.2.1-dev.3.0
### Core library changes
@@ -12,7 +8,35 @@
* Added `debugName` optional parameter to `Isolate.spawn` and
`Isolate.spawnUri`.
-### Dart VM
+### Tool Changes
+
+#### dartfmt
+
+* Tweak set literal formatting to follow other collection literals.
+* Add support for "UI as code" features.
+
+#### Linter
+
+The Linter was updated to `0.1.83` which includes the following changes:
+
+* updated `file_names` to skip prefixed-extension Dart files (e.g., `.css.dart`, `.g.dart`)
+* updated SDK constraint to `2.2.0`
+* miscellaneous rule documentation fixes
+* (internal) updated sources to use Set literals
+* fixed NPE in `avoid_shadowing_type_parameters`
+* added linter version numbering for use in analyzer summaries
+* fixed type utilities to handle inheritance cycles
+* (internal) changes to adopt new `package:analyzer` APIs
+* fixed `unnecessary_parenthesis` false positives
+
+## 2.2.1-dev.2.0
+
+## 2.2.1-dev.1.1
+
+* Cherry-pick 567d552de8ff93d704111467e7f3bf3b896ab684 to dev
+* Cherry-pick 4ca57befd707a0309e384472a566c084eef0e56e to dev
+
+## 2.2.1-dev.1.0
* Support for deprecated flags '-c' and '--checked' has been removed
* RegExp patterns can now use lookbehind assertions.
@@ -65,26 +89,11 @@
[visualizer]: https://dart-lang.github.io/dump-info-visualizer/
-#### dartfmt
+## 2.2.1-dev.0.0
-* Tweak set literal formatting to follow other collection literals.
-* Add support for "UI as code" features.
-
-#### Linter
-
-The Linter was updated to `0.1.83` which includes the following changes:
-
-* updated `file_names` to skip prefixed-extension Dart files (e.g., `.css.dart`, `.g.dart`)
-* updated SDK constraint to `2.2.0`
-* miscellaneous rule documentation fixes
-* (internal) updated sources to use Set literals
-* fixed NPE in `avoid_shadowing_type_parameters`
-* added linter version numbering for use in analyzer summaries
-* fixed type utilities to handle inheritance cycles
-* (internal) changes to adopt new `package:analyzer` APIs
-* fixed `unnecessary_parenthesis` false positives
-
-#### Other Tools
+* Cherry-pick 6f8415245d4dd298730facf83e03de69fc29bbd3 to dev
+* Cherry-pick e7d263b05f7f66d15f778df60ee60625e9a3c5f4 to dev
+* Cherry-pick dc8a56bc0ece296915c7016e0a8241c7068eca18 to dev
## 2.2.0 - 2019-02-26
diff --git a/tools/VERSION b/tools/VERSION
index 100093a..46b49af 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -29,11 +29,11 @@
# * Deprecating an old ABI version:
# - increase OLDEST_SUPPORTED_ABI_VERSION to the version that is supported.
#
-CHANNEL be
+CHANNEL dev
MAJOR 2
MINOR 2
PATCH 1
-PRERELEASE 0
+PRERELEASE 3
PRERELEASE_PATCH 0
ABI_VERSION 1
OLDEST_SUPPORTED_ABI_VERSION 0
