Merge branch 'master' into bump
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bc7c37..b595ef3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.2.12-dev
+# 0.2.12
* Add support for assert() in constructor initializers.
* Correctly indent the right-hand side of `is` and `as` expressions.
diff --git a/bin/format.dart b/bin/format.dart
index b0c1e32..1dcad32 100644
--- a/bin/format.dart
+++ b/bin/format.dart
@@ -14,7 +14,7 @@
import 'package:dart_style/src/source_code.dart';
// Note: The following line of code is modified by tool/grind.dart.
-const version = "0.2.11+1";
+const version = "0.2.12";
void main(List<String> args) {
var parser = new ArgParser(allowTrailingOptions: true);
diff --git a/pubspec.lock b/pubspec.lock
index bd701ed..74da498 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -6,7 +6,7 @@
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
- version: "0.29.0"
+ version: "0.29.1"
ansicolor:
description:
name: ansicolor
@@ -198,7 +198,7 @@
name: scheduled_test
url: "https://pub.dartlang.org"
source: hosted
- version: "0.12.6+1"
+ version: "0.12.7"
shelf:
description:
name: shelf
@@ -270,7 +270,7 @@
name: test
url: "https://pub.dartlang.org"
source: hosted
- version: "0.12.16"
+ version: "0.12.17"
typed_data:
description:
name: typed_data
diff --git a/pubspec.yaml b/pubspec.yaml
index 29efd1e..40a0e05 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
name: dart_style
# Note: See tool/grind.dart for how to bump the version.
-version: 0.2.12-dev
+version: 0.2.12
author: Dart Team <misc@dartlang.org>
description: Opinionated, automatic Dart source code formatter.
homepage: https://github.com/dart-lang/dart_style
