misc: support Dart2 in current release of json_annotation/serializable

.travis.yml

@@ -60,7 +60,7 @@ stages:
 
 # Only building master means that we don't run two builds for each pull request.
 branches:
-  only: [master]
+  only: [master,0_5_x]
 
 cache:
   directories:

example/README.md

@@ -11,7 +11,7 @@ dependencies:
   json_annotation: ^0.2.5
 
 dev_dependencies:
-  build_runner: ^0.8.9
+  build_runner: ^0.9.0
   json_serializable: ^0.5.4
 ```
 

example/pubspec.yaml

@@ -2,15 +2,15 @@ name: example
 author: Dart Team <misc@dartlang.org>
 
 environment:
-  sdk: '>=2.0.0-dev.54 <2.0.0'
+  sdk: '>=2.0.0-dev.54 <3.0.0'
 
 dependencies:
   json_annotation: ^0.2.5
 
 dev_dependencies:
-  build_runner: ^0.8.9
+  build_runner: ^0.9.0
   json_serializable: ^0.5.4
 
   # Used by tests. Not required to use `json_serializable`.
   path: ^1.5.1
-  test: ^0.12.38
+  test: ^1.3.0

example/test/ensure_build_test.dart

@@ -45,8 +45,7 @@ final _whitespace = new RegExp(r'\s');
 Set<String> _changedGeneratedFiles() {
   var output = _runProc('git', ['status', '--porcelain']);
 
-  return LineSplitter
-      .split(output)
+  return LineSplitter.split(output)
       .map((line) => line.split(_whitespace).last)
       .where((path) => path.endsWith('.dart'))
       .toSet();

example/test/readme_test.dart

@@ -23,6 +23,6 @@ dependencies:
   json_annotation: ^0.2.5
 
 dev_dependencies:
-  build_runner: ^0.8.9
+  build_runner: ^0.9.0
   json_serializable: ^0.5.4
 ''';

json_annotation/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.9+1
+
+* Support the Dart 2.0 stable release.
+
 ## 0.2.9
 
 * When `FormatException` is caught in "checked mode", use the `message`

json_annotation/pubspec.yaml

@@ -1,9 +1,9 @@
 name: json_annotation
-version: 0.2.9
+version: 0.2.9+1
 description: >-
   Classes and helper functions that support JSON code generation via the
   `json_serializable` package.
 homepage: https://github.com/dart-lang/json_serializable
 author: Dart Team <misc@dartlang.org>
 environment:
-  sdk: '>=2.0.0-dev.54.0 <2.0.0'
+  sdk: '>=2.0.0-dev.54.0 <3.0.0'

json_serializable/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.8+1
+
+* Support the Dart 2.0 stable release.
+
 ## 0.5.8
 
 * Small fixes to support Dart 2 runtime semantics.

json_serializable/pubspec.yaml

@@ -1,10 +1,10 @@
 name: json_serializable
-version: 0.5.8
+version: 0.5.8+1
 author: Dart Team <misc@dartlang.org>
 description: Generates utilities to aid in serializing to/from JSON.
 homepage: https://github.com/dart-lang/json_serializable
 environment:
-  sdk: '>=2.0.0-dev.54 <2.0.0'
+  sdk: '>=2.0.0-dev.54 <3.0.0'
 
 dependencies:
   analyzer: ^0.32.0
@@ -19,7 +19,7 @@ dependencies:
   source_gen: ^0.8.2
 
 dev_dependencies:
-  build_runner: ^0.8.0
+  build_runner: ^0.9.0
   build_web_compilers: ^0.4.0+1
   build_test: ^0.10.0
   collection: ^1.14.0

json_serializable/test/ensure_build_test.dart

@@ -44,8 +44,7 @@ final _whitespace = new RegExp(r'\s');
 Set<String> _changedGeneratedFiles() {
   var output = _runProc('git', ['status', '--porcelain']);
 
-  return LineSplitter
-      .split(output)
+  return LineSplitter.split(output)
       .map((line) => line.split(_whitespace).last)
       .where((path) => path.endsWith('.dart'))
       .toSet();

json_serializable/test/literal/json_literal.g.dart

@@ -52,6 +52,7 @@ final _$dataJsonLiteral = [
     'bool': true
   }
 ];
+
 const _$asConstJsonLiteral = const [
   const {
     'backspace': '\b',
@@ -94,6 +95,7 @@ const _$asConstJsonLiteral = const [
     'bool': true
   }
 ];
+
 const _$naughtyStringsJsonLiteral = const [
   '',
   'undefined',