Update to latest split build package

CHANGELOG.md

@@ -1,6 +1,7 @@
-## 0.5.2-dev
+## 0.5.2
 
 * Use library URIs (not names) to look up annotations in the mirror system.
+* Loosen version constraint to allow package:build version 0.6
 
 ## 0.5.1+7
 

pubspec.yaml

@@ -1,18 +1,19 @@
 name: source_gen
-version: 0.5.2-dev
+version: 0.5.2
 author: Dart Team <misc@dartlang.org>
 description: Automatic sourcecode generation for Dart
 homepage: https://github.com/dart-lang/source_gen
 environment:
   sdk: '>=1.12.0 <2.0.0'
 dependencies:
   analyzer: '>=0.28.0 <0.30.0'
-  build: '>=0.2.1 <0.6.0'
+  build: '>=0.2.1 <0.7.0'
   cli_util: ^0.0.1
   dart_style: '>=0.1.7 <0.3.0'
   path: ^1.3.2
 dev_dependencies:
-  build_test: ^0.2.0+1
+  build_runner: ^0.1.0
+  build_test: ^0.3.0
   collection: ^1.1.2
   mockito: '>=0.11.0 <2.0.0'
   test: ^0.12.3

test/builder_test.dart

@@ -5,46 +5,47 @@
 import 'dart:async';
 
 import 'package:analyzer/dart/element/element.dart';
-import 'package:build/build.dart';
+import 'package:build_test/build_test.dart';
 import 'package:source_gen/builder.dart';
 import 'package:source_gen/source_gen.dart';
 import 'package:test/test.dart';
 
 import 'src/comment_generator.dart';
-import 'src/test_phases.dart';
 
 void main() {
   test('Simple Generator test', _simpleTest);
 
   test('Bad generated source', () async {
     var srcs = _createPackageStub(pkgName);
-    var phaseGroup = new PhaseGroup.singleAction(
-        new GeneratorBuilder([const _BadOutputGenerator()]),
-        new InputSet(pkgName, ['lib/test_lib.dart']));
+    var builder = new GeneratorBuilder([const _BadOutputGenerator()]);
 
-    await testPhases(phaseGroup, pkgName, srcs, {
-      '$pkgName|lib/test_lib.g.dart': contains('not valid code!'),
-    });
+    await testBuilder(builder, srcs,
+        generateFor: new Set.from(['$pkgName|lib/test_lib.dart']),
+        outputs: {
+          '$pkgName|lib/test_lib.g.dart': contains('not valid code!'),
+        });
   });
 
   test('Generate standalone output file', () async {
     var srcs = _createPackageStub(pkgName);
-    var phaseGroup = new PhaseGroup.singleAction(
-        new GeneratorBuilder([const CommentGenerator()], isStandalone: true),
-        new InputSet(pkgName, ['lib/test_lib.dart']));
-    await testPhases(phaseGroup, pkgName, srcs, {
-      '$pkgName|lib/test_lib.g.dart': _testGenStandaloneContent,
-    });
+    var builder =
+        new GeneratorBuilder([const CommentGenerator()], isStandalone: true);
+    await testBuilder(builder, srcs,
+        generateFor: new Set.from(['$pkgName|lib/test_lib.dart']),
+        outputs: {
+          '$pkgName|lib/test_lib.g.dart': _testGenStandaloneContent,
+        });
   });
 
   test('Generate explicitly non-standalone output file', () async {
     var srcs = _createPackageStub(pkgName);
-    var phaseGroup = new PhaseGroup.singleAction(
-        new GeneratorBuilder([const CommentGenerator()], isStandalone: false),
-        new InputSet(pkgName, ['lib/test_lib.dart']));
-    await testPhases(phaseGroup, pkgName, srcs, {
-      '$pkgName|lib/test_lib.g.dart': _testGenPartContent,
-    });
+    var builder =
+        new GeneratorBuilder([const CommentGenerator()], isStandalone: false);
+    await testBuilder(builder, srcs,
+        generateFor: new Set.from(['$pkgName|lib/test_lib.dart']),
+        outputs: {
+          '$pkgName|lib/test_lib.g.dart': _testGenPartContent,
+        });
   });
 
   test('Expect error when multiple generators used on a standalone builder',
@@ -78,22 +79,19 @@ void main() {
 
   test('No-op generator produces no generated parts', () async {
     var srcs = _createPackageStub(pkgName);
-    var phaseGroup = new PhaseGroup.singleAction(
-        new GeneratorBuilder([const _NoOpGenerator()]),
-        new InputSet(pkgName, ['lib/test_lib.dart']));
-
-    await testPhases(phaseGroup, pkgName, srcs, {});
+    var builder = new GeneratorBuilder([const _NoOpGenerator()]);
+    await testBuilder(builder, srcs, outputs: {});
   });
 
   test('handle generator errors well', () async {
     var srcs =
         _createPackageStub(pkgName, testLibContent: _testLibContentWithError);
-    var phaseGroup = new PhaseGroup.singleAction(
-        new GeneratorBuilder([const CommentGenerator()]),
-        new InputSet(pkgName, ['lib/test_lib.dart']));
-    await testPhases(phaseGroup, pkgName, srcs, {
-      '$pkgName|lib/test_lib.g.dart': _testGenPartContentError,
-    });
+    var builder = new GeneratorBuilder([const CommentGenerator()]);
+    await testBuilder(builder, srcs,
+        generateFor: new Set.from(['$pkgName|lib/test_lib.dart']),
+        outputs: {
+          '$pkgName|lib/test_lib.g.dart': _testGenPartContentError,
+        });
   });
 }
 
@@ -103,12 +101,13 @@ Future _simpleTest() => _generateTest(
 
 Future _generateTest(CommentGenerator gen, String expectedContent) async {
   var srcs = _createPackageStub(pkgName);
-  var phaseGroup = new PhaseGroup.singleAction(new GeneratorBuilder([gen]),
-      new InputSet(pkgName, ['lib/test_lib.dart']));
+  var builder = new GeneratorBuilder([gen]);
 
-  await testPhases(phaseGroup, pkgName, srcs, {
-    '$pkgName|lib/test_lib.g.dart': expectedContent,
-  });
+  await testBuilder(builder, srcs,
+      generateFor: new Set.from(['$pkgName|lib/test_lib.dart']),
+      outputs: {
+        '$pkgName|lib/test_lib.g.dart': expectedContent,
+      });
 }
 
 /// Creates a package using [pkgName].

tool/build.dart

@@ -1,9 +1,7 @@
 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-library source_gen.tool.build;
-
-import 'package:build/build.dart';
+import 'package:build_runner/build_runner.dart';
 
 import 'phases.dart';
 

tool/phases.dart

@@ -1,9 +1,7 @@
 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-library source_gen.tool.phases;
-
-import 'package:build/build.dart';
+import 'package:build_runner/build_runner.dart';
 
 import 'package:source_gen/generators/json_literal_generator.dart' as literal;
 import 'package:source_gen/generators/json_serializable_generator.dart' as json;

tool/watch.dart

@@ -1,9 +1,7 @@
 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-library source_gen.tool.watch;
-
-import 'package:build/build.dart';
+import 'package:build_runner/build_runner.dart';
 
 import 'phases.dart';