Merge remote-tracking branch 'upstream/master' into add_built_redux_s…

…upport/dev

# Conflicts:
#	pubspec.yaml

pubspec.yaml

@@ -8,9 +8,10 @@ environment:
   sdk: ">=1.24.2"
 dependencies:
   analyzer: ">=0.30.0 <0.31.0"
-  barback: "^0.15.0"
+  barback: ^0.15.0
   built_redux: ">=6.1.0 < 8.0.0"
-  js: "^0.6.0"
+  built_value: ^4.2.0
+  js: ^0.6.0
   logging: ">=0.11.3+1 <1.0.0"
   meta: ^1.0.4
   path: ^1.4.1
@@ -23,14 +24,14 @@ dependencies:
   quiver: ">=0.21.4 <0.26.0"
 dev_dependencies:
   build_runner: ^0.5.0
-  built_value: ^4.2.0
   built_value_generator: ^4.2.0
-  matcher: ">=0.11.0 <0.13.0"
-  coverage: "^0.7.2"
-  dart_dev: "^1.7.6"
-  mockito: "^0.11.0"
-  over_react_test: "^1.2.0"
-  test: "^0.12.24"
+  coverage: ^0.7.2
+  dart_dev: ^1.7.6
+  dependency_validator: ^1.0.0
+  mockito: ^0.11.0
+  over_react_test: ^1.2.0
+  source_gen: ^0.7.2+1
+  test: ^0.12.24
 
 transformers:
   - over_react: