Upgrade to latest build_runner.

.travis.yml

@@ -1,5 +1,5 @@
 
 language: dart
-dart: stable
+dart: dev
 script:
   - tool/presubmit

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+# 5.2.0
+
+- Upgrade to latest `built_runner`. You no longer need `build.dart` or
+  `watch.dart`. Instead, make sure you have a dev dependency on
+  `built_value_generator` and `build_runner`, then run
+  `pub run build_runner build` or `pub run build_runner watch`.
+- Note: this version requires the pre release of the Dart 2 SDK.
+
 # 5.1.3
 
 - Generate simpler deserialization code for `built_collection` instances.

README.md

@@ -32,10 +32,16 @@ built_value.
 Simple examples are
 [here](https://github.com/google/built_value.dart/tree/master/example/lib/example.dart).
 
-Codegen is triggered via either a
-[build.dart](https://github.com/google/built_value.dart/blob/master/example/tool/build.dart)
+Since `v5.2.0` codegen is triggered by running `pub run build_runner build` to
+do a one-off build or `pub run build_runner watch` to continuously watch your
+source and update the generated output when it changes. Note that you need a
+dev dependency on `built_value_generator` and `build_runner`. See the example
+[pubspec.yaml](https://github.com/google/built_value.dart/blob/master/example/pubspec.yaml).
+
+If using a version before v5.2.0, codegen is triggered via either a
+[build.dart](https://github.com/google/built_value.dart/blob/92783c27a08ac3c73f28bb08736b9d4a30fa3b7e/example/tool/build.dart)
 to do a one-off build or a
-[watch.dart](https://github.com/google/built_value.dart/blob/master/example/tool/watch.dart)
+[watch.dart](https://github.com/google/built_value.dart/blob/92783c27a08ac3c73f28bb08736b9d4a30fa3b7e/example/tool/watch.dart)
 to continuously watch your source and update generated output.
 
 ## Value Types

benchmark/pubspec.yaml

@@ -1,23 +1,27 @@
 name: benchmark
-version: 5.1.3
+version: 5.2.0
 description: >
   Benchmark, not for publishing.
 authors:
 - David Morgan <[email protected]>
 homepage: https://github.com/google/built_value.dart
 
 environment:
-  sdk: '>=1.8.0 <2.0.0'
+  sdk: '>=2-0-0-dev <2.0.0'
 
 dependencies:
   browser: any
   built_collection: '>=2.0.0 <4.0.0'
-  built_value: ^5.1.3
+  built_value: ^5.2.0
 
 dev_dependencies:
-  build: ^0.11.1
-  build_runner: ^0.6.0
-  built_value_generator: ^5.1.3
-  source_gen: ^0.7.0
+  build_runner: ^0.7.9
+# built_value_generator: ^5.2.0
+  built_value_generator:
+    path: ../built_value_generator
   quiver: '>=0.21.0 <0.29.0'
   test: any
+
+dependency_overrides:
+  built_value:
+    path: ../built_value

built_value/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_value
-version: 5.1.3
+version: 5.2.0
 description: >
   Value types with builders, Dart classes as enums, and serialization.
   This library is the runtime dependency.
@@ -8,9 +8,10 @@ authors:
 homepage: https://github.com/google/built_value.dart
 
 environment:
-  sdk: '>=1.21.0 <2.0.0'
+  sdk: '>=2-0-0-dev <2.0.0'
 
 dependencies:
+  build_config: ^0.2.3
   built_collection: '>=2.0.0 <4.0.0'
   collection: ^1.0.0
   fixnum: ^0.10.0

built_value_generator/build.yaml

@@ -0,0 +1,8 @@
+builders:
+  built_value:
+    target: ":built_value_generator"
+    import: "package:built_value_generator/builder.dart"
+    builder_factories: ["builtValue"]
+    build_extensions: {".dart": [".g.dart"]}
+    auto_apply: dependents
+    build_to: source

built_value_generator/lib/builder.dart

@@ -0,0 +1,12 @@
+// Copyright (c) 2018, Google Inc. 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.
+
+import 'package:build/build.dart';
+
+import 'package:built_value_generator/built_value_generator.dart';
+import 'package:source_gen/source_gen.dart';
+
+Builder builtValue(BuilderOptions options) => new PartBuilder([
+      new BuiltValueGenerator(),
+    ], requireLibraryDirective: false);

built_value_generator/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_value_generator
-version: 5.1.3
+version: 5.2.0
 description: >
   Value types with builders, Dart classes as enums, and serialization.
   This library is the dev dependency.
@@ -8,17 +8,21 @@ authors:
 homepage: https://github.com/google/built_value.dart
 
 environment:
-  sdk: '>=1.12.0-dev.5.10 <2.0.0'
+  sdk: '>=2-0-0-dev <2.0.0'
 
 dependencies:
-  analyzer: '>=0.29.0 <0.31.0'
-  build: ^0.11.1
+  analyzer: '>=0.29.0 <0.32.0'
+  build: ^0.12.0
   built_collection: '>=2.0.0 <4.0.0'
-  built_value: ^5.1.3
-  source_gen: ^0.7.0
+#  built_value: ^5.2.0
+  source_gen: ^0.7.4
   quiver: '>=0.21.0 <0.29.0'
 
 dev_dependencies:
-  build_test: ^0.9.0
-  build_runner: ^0.6.0
+  build_test: ^0.10.0
+  build_runner: ^0.7.9
   test: any
+
+dependency_overrides:
+  built_value:
+    path: ../built_value

built_value_generator/test/enum_class_generator_test.dart

@@ -104,11 +104,11 @@ void main() {
           await generate(correctInput.replaceAll(
               'class TestEnum extends EnumClass {',
               'class TestEnum extends EnumClass {\n'
-              '  static const anInt = 3;')),
+              '  static const aNull = null;')),
           endsWith(r'''
 // Error: Please make the following changes to use EnumClass:
 //
-//        1. Specify a type for field "anInt".
+//        1. Specify a type for field "aNull".
 '''));
     });
 

built_value_test/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_value_test
-version: 5.1.3
+version: 5.2.0
 description: >
   Value types with builders, Dart classes as enums, and serialization.
   This library provides test support.
@@ -8,17 +8,20 @@ authors:
 homepage: https://github.com/google/built_value.dart
 
 environment:
-  sdk: '>=1.8.0 <2.0.0'
+  sdk: '>=2-0-0-dev <2.0.0'
 
 dependencies:
-  built_value: ^5.1.3
+  built_value: ^5.2.0
   built_collection: '>=2.0.0 <4.0.0'
   collection: ^1.0.0
   quiver: '>=0.21.0 <0.29.0'
   test: any
 
 dev_dependencies:
-  build: ^0.11.1
-  build_runner: ^0.6.0
-  built_value_generator: ^5.1.3
-  source_gen: ^0.7.0
+  build_runner: ^0.7.9
+  built_value_generator:
+    path: ../built_value_generator
+
+dependency_overrides:
+  built_value:
+    path: ../built_value

chat_example/pubspec.yaml

@@ -1,26 +1,30 @@
 name: chat_example
-version: 5.1.3
+version: 5.2.0
 description: >
   Just an example, not for publishing.
 authors:
 - David Morgan <[email protected]>
 homepage: https://github.com/google/built_value.dart
 
 environment:
-  sdk: '>=1.8.0 <2.0.0'
+  sdk: '>=2-0-0-dev <2.0.0'
 
 dependencies:
   browser: ^0.10.0
   built_collection: '>=2.0.0 <4.0.0'
-  built_value: ^5.1.3
+  built_value: ^5.2.0
   shelf: ^0.6.0
   shelf_proxy: ^0.1.0
   shelf_web_socket: ^0.2.1
   web_socket_channel: ^1.0.0
 
 dev_dependencies:
-  build: ^0.11.1
-  build_runner: ^0.6.0
-  built_value_generator: ^5.1.3
-  source_gen: ^0.7.0
+  build_runner: ^0.7.9
+# built_value_generator: ^5.2.0
+  built_value_generator:
+    path: ../built_value_generator
   test: any
+
+dependency_overrides:
+  built_value:
+    path: ../built_value

end_to_end_test/pubspec.yaml

@@ -1,23 +1,27 @@
 name: end_to_end_test
-version: 5.1.3
+version: 5.2.0
 description: >
   Tests, not for publishing.
 authors:
 - David Morgan <[email protected]>
 homepage: https://github.com/google/built_value.dart
 
 environment:
-  sdk: '>=1.8.0 <2.0.0'
+  sdk: '>=2-0-0-dev <2.0.0'
 
 dependencies:
   built_collection: '>=2.0.0 <4.0.0'
-  built_value: ^5.1.3
+  built_value: ^5.2.0
 
 dev_dependencies:
-  build: ^0.11.1
-  build_runner: ^0.6.0
-  built_value_generator: ^5.1.3
+  build: ^0.12.0
+# built_value_generator: ^5.2.0
+  built_value_generator:
+    path: ../built_value_generator
   fixnum: ^0.10.0
-  source_gen: ^0.7.0
   quiver: '>=0.21.0 <0.29.0'
   test: any
+
+dependency_overrides:
+  built_value:
+    path: ../built_value