Drop support for older Barback versions.

This also allows us to limit our tests to the latest barback, which
simplifies the necessary infrastructure and speeds up the tests
dramatically.

Closes #1367

[email protected]

Review URL: https://codereview.chromium.org//1530353002 .

Author: nex3

.gitmodules

@@ -1,7 +1,4 @@
 {
-  "pre_test_hooks": {
-    "Update submodules": "git submodule update --init --force"
-  },
   "test_package": {
     "platforms": ["vm"]
   }

.test_config

@@ -9,10 +9,6 @@ import 'dart:isolate';
 
 import 'package:barback/barback.dart';
 
-//# if source_maps >=0.9.0 <0.10.0
-//> import 'package:source_maps/span.dart';
-//# end
-
 //# if source_span
 import 'package:source_span/source_span.dart';
 //# end
@@ -57,17 +53,6 @@ SourceSpan deserializeSpan(Map span) {
 ///
 /// [location] may be a [SourceLocation] or a [SourceLocation].
 Map serializeLocation(location) {
-//# if source_maps >=0.9.0 <0.10.0
-//>  if (location is Location) {
-//>    return {
-//>      'sourceUrl': location.sourceUrl,
-//>      'offset': location.offset,
-//>      'line': location.line,
-//>      'column': location.column
-//>    };
-//>  }
-//# end
-
 //# if source_span
   // TODO(nweiz): convert FileLocations to FileLocations.
   if (location is SourceLocation) {

lib/src/asset/dart/serialize.dart

@@ -120,7 +120,6 @@ class _ForeignBaseAggregateTransform {
 // barback versions because merely referencing undefined types in type
 // annotations isn't a static error. Only implementing an undefined interface is
 // a static error.
-//# if barback >=0.14.1
 
 /// A wrapper for an [AggregateTransform] that's in the host isolate.
 ///
@@ -169,5 +168,3 @@ class ForeignDeclaringAggregateTransform
     });
   }
 }
-
-//# end

lib/src/asset/dart/serialize/aggregate_transform.dart

@@ -39,7 +39,7 @@ void loadTransformers(SendPort replyTo) {
 /// in it, instantiates them with [configuration] and [mode], and returns them.
 List _initialize(String uri, Map configuration, BarbackMode mode) {
   var transformerClass = reflectClass(Transformer);
-  var aggregateClass = _aggregateTransformerClass;
+  var aggregateClass = reflectClass(AggregateTransformer);
   var groupClass = reflectClass(TransformerGroup);
 
   var seen = new Set();
@@ -64,8 +64,7 @@ List _initialize(String uri, Map configuration, BarbackMode mode) {
       if (classMirror.isAbstract) return null;
       if (!classMirror.isSubtypeOf(transformerClass) &&
           !classMirror.isSubtypeOf(groupClass) &&
-          (aggregateClass == null ||
-              !classMirror.isSubtypeOf(aggregateClass))) {
+          !classMirror.isSubtypeOf(aggregateClass)) {
         return null;
       }
 
@@ -100,13 +99,3 @@ MethodMirror _getConstructor(ClassMirror classMirror, String constructor) {
   if (candidate is MethodMirror && candidate.isConstructor) return candidate;
   return null;
 }
-
-// Older barbacks don't support [AggregateTransformer], and calling
-// [reflectClass] on an undefined class will throw an error, so we just define a
-// null getter for them.
-//# if barback >=0.14.1
-ClassMirror get _aggregateTransformerClass =>
-    reflectClass(AggregateTransformer);
-//# else
-//>   ClassMirror get _aggregateTransformerClass => null;
-//# end

lib/src/asset/dart/transformer_isolate.dart

@@ -37,7 +37,7 @@ import 'package:pub_semver/pub_semver.dart';
 ///
 /// [compat]: https://gist.github.com/nex3/10942218
 final pubConstraints = {
-  "barback": new VersionConstraint.parse(">=0.13.0 <0.15.3"),
+  "barback": new VersionConstraint.parse(">=0.15.0 <0.15.3"),
   "source_span": new VersionConstraint.parse(">=1.0.0 <2.0.0"),
   "stack_trace": new VersionConstraint.parse(">=0.9.1 <2.0.0")
 };

lib/src/barback.dart

@@ -28,32 +28,30 @@ class ModeTransformer extends Transformer {
 """;
 
 main() {
-  withBarbackVersions("any", () {
-    integration("allows user-defined mode names", () {
-      d.dir(appPath, [
-        d.pubspec({
-          "name": "myapp",
-          "transformers": ["myapp/src/transformer"]
-        }),
-        d.dir("lib", [d.dir("src", [
-          d.file("transformer.dart", TRANSFORMER)
-        ])]),
-        d.dir("web", [
-          d.file("foo.txt", "foo")
+  integration("allows user-defined mode names", () {
+    d.dir(appPath, [
+      d.pubspec({
+        "name": "myapp",
+        "transformers": ["myapp/src/transformer"]
+      }),
+      d.dir("lib", [d.dir("src", [
+        d.file("transformer.dart", TRANSFORMER)
+      ])]),
+      d.dir("web", [
+        d.file("foo.txt", "foo")
+      ])
+    ]).create();
+
+    createLockFile('myapp', pkg: ['barback']);
+
+    schedulePub(args: ["build", "--mode", "depeche"]);
+
+    d.dir(appPath, [
+      d.dir('build', [
+        d.dir('web', [
+          d.file('foo.out', 'depeche')
         ])
-      ]).create();
-
-      createLockFile('myapp', pkg: ['barback']);
-
-      schedulePub(args: ["build", "--mode", "depeche"]);
-
-      d.dir(appPath, [
-        d.dir('build', [
-          d.dir('web', [
-            d.file('foo.out', 'depeche')
-          ])
-        ])
-      ]).validate();
-    });
+      ])
+    ]).validate();
   });
 }

test/build/allows_arbitrary_modes_test.dart

@@ -28,32 +28,30 @@ class ModeTransformer extends Transformer {
 """;
 
 main() {
-  withBarbackVersions("any", () {
-    integration("defaults to release mode", () {
-      d.dir(appPath, [
-        d.pubspec({
-          "name": "myapp",
-          "transformers": ["myapp/src/transformer"]
-        }),
-        d.dir("lib", [d.dir("src", [
-          d.file("transformer.dart", TRANSFORMER)
-        ])]),
-        d.dir("web", [
-          d.file("foo.txt", "foo")
-        ])
-      ]).create();
-
-      createLockFile('myapp', pkg: ['barback']);
-
-      schedulePub(args: ["build"]);
-
-      d.dir(appPath, [
-        d.dir('build', [
-          d.dir('web', [
-            d.file('foo.out', 'release')
-          ])
-        ])
-      ]).validate();
-    });
-  });
+   integration("defaults to release mode", () {
+     d.dir(appPath, [
+       d.pubspec({
+         "name": "myapp",
+         "transformers": ["myapp/src/transformer"]
+       }),
+       d.dir("lib", [d.dir("src", [
+         d.file("transformer.dart", TRANSFORMER)
+       ])]),
+       d.dir("web", [
+         d.file("foo.txt", "foo")
+       ])
+     ]).create();
+
+     createLockFile('myapp', pkg: ['barback']);
+
+     schedulePub(args: ["build"]);
+
+     d.dir(appPath, [
+       d.dir('build', [
+         d.dir('web', [
+           d.file('foo.out', 'release')
+         ])
+       ])
+     ]).validate();
+   });
 }

test/build/defaults_to_release_mode_test.dart

@@ -27,35 +27,33 @@ class RewriteTransformer extends Transformer {
 """;
 
 main() {
-  withBarbackVersions("any", () {
-    integration("outputs error to JSON in a failed build", () {
-      d.dir(appPath, [
-        d.pubspec({
-          "name": "myapp",
-          "transformers": ["myapp"]
-        }),
-        d.dir("lib", [
-          d.file("transformer.dart", TRANSFORMER)
-        ]),
-        d.dir("web", [
-          d.file("foo.txt", "foo")
-        ])
-      ]).create();
-
-      createLockFile('myapp', pkg: ['barback']);
-
-      schedulePub(args: ["build", "--format", "json"],
-          outputJson: {
-            "buildResult": "failure",
-            "errors": [
-              {
-                "error": startsWith("Transform Rewrite on myapp|web/foo.txt "
-                    "threw error: oh no!")
-              }
-            ],
-            "log": []
-          },
-          exitCode: exit_codes.DATA);
-    });
-  });
+   integration("outputs error to JSON in a failed build", () {
+     d.dir(appPath, [
+       d.pubspec({
+         "name": "myapp",
+         "transformers": ["myapp"]
+       }),
+       d.dir("lib", [
+         d.file("transformer.dart", TRANSFORMER)
+       ]),
+       d.dir("web", [
+         d.file("foo.txt", "foo")
+       ])
+     ]).create();
+
+     createLockFile('myapp', pkg: ['barback']);
+
+     schedulePub(args: ["build", "--format", "json"],
+         outputJson: {
+           "buildResult": "failure",
+           "errors": [
+             {
+               "error": startsWith("Transform Rewrite on myapp|web/foo.txt "
+                   "threw error: oh no!")
+             }
+           ],
+           "log": []
+         },
+         exitCode: exit_codes.DATA);
+   });
 }

test/build/outputs_error_to_json_test.dart

@@ -9,30 +9,28 @@ import '../test_pub.dart';
 import '../serve/utils.dart';
 
 main() {
-  withBarbackVersions("any", () {
-    integration("compiles a generated Dart file to JS", () {
-      d.dir(appPath, [
-        d.pubspec({
-          "name": "myapp",
-          "version": "0.0.1",
-          "transformers": ["myapp/transformer"]
-        }),
-        d.dir("lib", [
-          d.file("transformer.dart", dartTransformer("munge"))
-        ]),
-        d.dir("web", [
-          d.file("main.dart", """
+  integration("compiles a generated Dart file to JS", () {
+    d.dir(appPath, [
+      d.pubspec({
+        "name": "myapp",
+        "version": "0.0.1",
+        "transformers": ["myapp/transformer"]
+      }),
+      d.dir("lib", [
+        d.file("transformer.dart", dartTransformer("munge"))
+      ]),
+      d.dir("web", [
+        d.file("main.dart", """
 const TOKEN = "before";
 void main() => print(TOKEN);
 """)
-        ])
-      ]).create();
+      ])
+    ]).create();
 
-      createLockFile('myapp', pkg: ['barback']);
+    createLockFile('myapp', pkg: ['barback']);
 
-      pubServe();
-      requestShouldSucceed("main.dart.js", contains("(before, munge)"));
-      endPubServe();
-    });
+    pubServe();
+    requestShouldSucceed("main.dart.js", contains("(before, munge)"));
+    endPubServe();
   });
 }

test/dart2js/compiles_generated_dart_file_test.dart

@@ -10,36 +10,34 @@ import '../serve/utils.dart';
 
 main() {
   // This is a regression test for issue #17198.
-  withBarbackVersions("any", () {
-    integration("compiles a Dart file that imports a generated file to JS "
-        "outside web/", () {
-      d.dir(appPath, [
-        d.pubspec({
-          "name": "myapp",
-          "version": "0.0.1",
-          "transformers": ["myapp/transformer"]
-        }),
-        d.dir("lib", [
-          d.file("transformer.dart", dartTransformer("munge"))
-        ]),
-        d.dir("test", [
-          d.file("main.dart", """
+  integration("compiles a Dart file that imports a generated file to JS "
+      "outside web/", () {
+    d.dir(appPath, [
+      d.pubspec({
+        "name": "myapp",
+        "version": "0.0.1",
+        "transformers": ["myapp/transformer"]
+      }),
+      d.dir("lib", [
+        d.file("transformer.dart", dartTransformer("munge"))
+      ]),
+      d.dir("test", [
+        d.file("main.dart", """
 import "other.dart";
 void main() => print(TOKEN);
 """),
-          d.file("other.dart", """
+        d.file("other.dart", """
 library other;
 const TOKEN = "before";
 """)
         ])
-      ]).create();
+    ]).create();
 
-      createLockFile('myapp', pkg: ['barback']);
+    createLockFile('myapp', pkg: ['barback']);
 
-      pubServe(args: ["test"]);
-      requestShouldSucceed("main.dart.js", contains("(before, munge)"),
-          root: "test");
-      endPubServe();
-    });
+    pubServe(args: ["test"]);
+    requestShouldSucceed("main.dart.js", contains("(before, munge)"),
+        root: "test");
+    endPubServe();
   });
 }