Use dart_dev v2 WIP

.gitignore

@@ -5,6 +5,7 @@ packages
 pubspec.lock
 .dart_tool
 node_modules
+/build/
 
 # javascript
 node_modules/

.travis.yml

@@ -10,41 +10,17 @@ cache:
   directories:
     - $HOME/.pub-cache
 
-stages:
-  - quality
-  - test
-
-jobs:
-  include:
-    - stage: quality
-      dart: 1.24.3
-      script:
-        - pub run dart_dev format --check
-        - dartanalyzer lib test tool
-        - cd example && pub get && dartanalyzer .; cd ..
-        - pub run dependency_validator -i build_runner,build_test,build_web_compilers,browser,coverage,dart_style --exclude-dir=example
-
-    - stage: quality
-      dart: dev
-      script:
-        - dartanalyzer lib test tool
-        - cd example && pub get && dartanalyzer .; cd ..
-        - pub run dependency_validator -i build_runner,build_test,build_web_compilers,browser,coverage,dart_style --exclude-dir=example
-
-    - stage: test
-      dart: 1.24.3
-      script: ./tool/travis.sh test:unit
-
-    - stage: test
-      dart: dev
-      script: ./tool/travis.sh test:unit
-
-    - stage: test
-      dart: 1.24.3
-      before_script: npm install
-      script: ./tool/travis.sh test:integration
-
-    - stage: test
-      dart: dev
-      before_script: npm install
-      script: ./tool/travis.sh test:integration
+dart:
+  - 1.24.3
+  - stable
+
+before_script:
+  - npm install
+
+script:
+  - pub run dart_dev analyze
+#  - cd example && pub get && dartanalyzer .; cd ..
+  - pub run dart_dev dart2-only -- format --check
+  - pub run dependency_validator -i build_runner,build_test,build_web_compilers,coverage,dart_style --exclude-dir=example
+  - pub run dart_dev dart1-only -- test -P integration -P travis
+  - pub run dart_dev dart2-only -- test -P integration -P travis -P dart2

dart_test.yaml

@@ -3,27 +3,23 @@
 #
 # Run unit tests:
 #
-#     $ pub run test
+#     $ pub run dart_dev test -P dart1
 #
 # Run integration tests:
 #
-#     $ node tool/server/sockjs.js
-#     $ dart tool/server/server.dart
-#     $ pub run test -P integration
+#     $ pub run dart_dev test -P dart1 -P integration
 #
 #
 # Dart 2:
 # -------
 #
 # Run unit tests:
 #
-#     $ pub run build_runner test
+#     $ pub run dart_dev test -P dart1
 #
 # Run integration tests:
 #
-#     $ node tool/server/sockjs.js
-#     $ dart tool/server/server.dart
-#     $ pub run build_runner test -- -P integration
+#     $ pub run dart_dev test -P dart2 -P integration
 platforms:
   - chrome
   - vm

example/pubspec.yaml

@@ -3,7 +3,6 @@ version: 0.0.0
 private: true
 
 dev_dependencies:
-  browser: ^0.10.0+2
   collection: ^1.14.6
   over_react: ^1.24.0
   w_transport:

lib/src/http/common/request.dart

@@ -780,7 +780,8 @@ abstract class CommonRequest extends Object
       // Attempt to fetch the response.
       // ignore: unawaited_futures
       sendRequestAndFetchResponse(finalizedRequest,
-          streamResponse: streamResponse).then((response) {
+              streamResponse: streamResponse)
+          .then((response) {
         if (!responseCompleter.isCompleted) {
           responseCompleter.complete(response);
         }

lib/src/web_socket/vm/web_socket.dart

@@ -41,8 +41,8 @@ class VMWebSocket extends CommonWebSocket implements WebSocket {
     io.WebSocket webSocket;
     bool wasSuccessful;
     try {
-      webSocket = await io.WebSocket
-          .connect(uri.toString(), headers: headers, protocols: protocols);
+      webSocket = await io.WebSocket.connect(uri.toString(),
+          headers: headers, protocols: protocols);
       wasSuccessful = true;
     } on io.SocketException catch (e) {
       wasSuccessful = false;

pubspec.yaml

@@ -17,7 +17,7 @@ authors:
   - Trent Grover <[email protected]>
 
 environment:
-  sdk: '>=1.24.3<3.0.0'
+  sdk: '>=1.24.3 <3.0.0'
 
 dependencies:
   dart2_constant: ^1.0.1
@@ -32,14 +32,18 @@ dependencies:
   sockjs_client_wrapper: ^1.0.5
 
 dev_dependencies:
-  build_runner: ">=0.6.0 <1.0.0"
+  build_runner: ">=0.6.0 <2.0.0"
   build_test: ">=0.9.0 <1.0.0"
   build_web_compilers: ">=0.2.0 <1.0.0"
   coverage: ">=0.10.0 <0.13.0"
-  # dart_dev: ^1.9.5
+  #dart_dev: ^2.0.0
+  dart_dev:
+    git:
+      url: git://github.com/Workiva/dart_dev.git
+      ref: 24496ae534d4bfdcd5a224f9249bda263e08ace7 # dart2
   dart_style: ^1.0.8
   dependency_validator: ^1.2.1
   http_server: ^0.9.6
-  mockito: '>=2.0.2 <4.0.0'
+  mockito: ">=2.0.2 <4.0.0"
   test: ">=0.12.30 <2.0.0"
   uuid: ">=0.5.3 <2.0.0"

test/integration/global_web_socket_monitor/browser_test.dart

@@ -31,8 +31,9 @@ void main() {
 
   group(naming.toString(), () {
     // ignore: deprecated_member_use
-    Future<transport.WebSocket> connect(Uri uri) => transport.WebSocket
-        .connect(uri, transportPlatform: browserTransportPlatform);
+    Future<transport.WebSocket> connect(Uri uri) =>
+        transport.WebSocket.connect(uri,
+            transportPlatform: browserTransportPlatform);
 
     runCommonGlobalWebSocketMonitorIntegrationTests(connect);
 

test/integration/global_web_socket_monitor/vm_test.dart

@@ -31,8 +31,9 @@ void main() {
 
   group(naming.toString(), () {
     // ignore: deprecated_member_use
-    Future<transport.WebSocket> connect(Uri uri) => transport.WebSocket
-        .connect(uri, transportPlatform: vmTransportPlatform);
+    Future<transport.WebSocket> connect(Uri uri) =>
+        transport.WebSocket.connect(uri,
+            transportPlatform: vmTransportPlatform);
 
     runCommonGlobalWebSocketMonitorIntegrationTests(connect);
 

test/unit/mocks/mock_http_test.dart

@@ -456,8 +456,8 @@ void main() {
           // ignore: unawaited_futures
           transport.Http.get(Uri.parse('/wrong')); // Wrong URI.
           await transport.Http.get(Uri.parse('https://google.com'));
-          await transport.Http
-              .get(Uri.parse('https://github.com/Workiva/w_transport'));
+          await transport.Http.get(
+              Uri.parse('https://github.com/Workiva/w_transport'));
           expect(MockTransports.http.numPendingRequests, equals(1));
 
           await MockTransports.reset();

test/unit/mocks/mock_web_socket_test.dart

@@ -405,8 +405,8 @@ void main() {
               equals(webSocket));
           expect(
               // ignore: deprecated_member_use
-              await transport.WSocket
-                  .connect(Uri.parse('ws://github.com/ws/listen')),
+              await transport.WSocket.connect(
+                  Uri.parse('ws://github.com/ws/listen')),
               equals(webSocket));
 
           // Non-matching connection fails.
@@ -432,8 +432,8 @@ void main() {
           MockTransports.webSocket.whenPattern(uriPattern, handler: handler);
 
           // ignore: deprecated_member_use
-          await transport.WSocket
-              .connect(Uri.parse('ws://github.com/ws/listen'));
+          await transport.WSocket.connect(
+              Uri.parse('ws://github.com/ws/listen'));
           expect(uriMatch.group(0), equals('ws://github.com/ws/listen'));
           expect(uriMatch.group(1), equals('github'));
         });

tool/dev.dart

@@ -26,10 +26,6 @@ Future<Null> main(List<String> args) async {
   final directories = <String>['example/', 'lib/', 'test/', 'tool/'];
 
   config.analyze.entryPoints = [
-    'example/',
-    'example/http/cross_origin_credentials/',
-    'example/http/cross_origin_file_transfer/',
-    'example/http/simple_client/',
     'lib/',
     'test/',
     'test/unit/',
@@ -46,11 +42,6 @@ Future<Null> main(List<String> args) async {
     ..before = [_streamServer, _streamSockJSServer]
     ..after = [_stopServer, _stopSockJSServer];
 
-  config.examples
-    ..port = 9000
-    ..before = [_streamServer, _streamSockJSServer, _serveExamples]
-    ..after = [_stopServer, _stopSockJSServer];
-
   config.format.paths = directories;
 
   config.test
@@ -87,8 +78,8 @@ List<String> _sockJSServerOutput;
 
 Future<Null> _serveExamples() {
   io.Process.runSync('pub', ['get'], workingDirectory: 'example');
-  io.Process
-      .start('pub', ['serve', '--port=9000'], workingDirectory: 'example');
+  io.Process.start('pub', ['serve', '--port=9000'],
+      workingDirectory: 'example');
 
   return new Completer<Null>().future;
 }