Merge pull request #42 from Workiva/batch/cplat/raise_more_max_versions

Raise More Max Versions

Author: rmconsole7-wk

.github/workflows/dart_ci.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        sdk: [ stable, beta, dev ]
+        sdk: [ 2.13.4, stable, beta, dev ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
@@ -29,33 +29,10 @@ jobs:
         run: dart pub get
       - name: Validate dependencies
         run: dart run dependency_validator
-      - name: Analyze project source
-        run: dart analyze
-      - name: Run tests
-        run: dart run dart_dev test
-
-  test_old_sdks:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        sdk: [2.13.4]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '15'
-      - uses: dart-lang/setup-dart@v1
-        with:
-          sdk: ${{ matrix.sdk }}
-      - name: Install Node dependencies
-        run: npm install
-      - name: Install Dart dependencies
-        run: pub get
-      - name: Validate dependencies
-        run: pub run dependency_validator
       - name: Check formatting
         run: dart format --output=none --set-exit-if-changed .
+        if: ${{ matrix.sdk == 'stable' }}
       - name: Analyze project source
-        run: dartanalyzer .
+        run: dart analyze
       - name: Run tests
-        run: pub run dart_dev test
+        run: dart run dart_dev test

CHANGELOG.md

@@ -1,4 +1,14 @@
-## 1.1.4
+## 1.1.8
+
+- Dependency upgrades.
+- Simplify Github CI workflow.
+- Formatting and analysis lints.
+
+## 1.1.6
+
+- Replace deprecated `pub` commands
+
+## 1.1.4 - 1.1.5
 
 - Dependency upgrades.
 

pubspec.yaml

@@ -8,13 +8,13 @@ environment:
 
 dependencies:
   js: ^0.6.1
-  w_common: ^1.20.1
+  w_common: '>=1.20.1 <3.0.0'
 
 dev_dependencies:
-  build_runner: '>=1.10.0 <3.0.0'
-  build_test: '>=0.10.9 <2.0.0'
-  build_web_compilers: ^2.12.0
+  build_runner: ^2.1.2
+  build_test: ^2.1.3
+  build_web_compilers: ^3.0.0
   dart_dev: ^3.6.5
-  dependency_validator: ^2.0.1
+  dependency_validator: ^3.2.0
   test: ^1.15.7
   workiva_analysis_options: ^1.1.0

test/missing_sockjs_lib_test.dart

@@ -15,7 +15,6 @@
 @TestOn('browser')
 library sockjs_client.test.sockjs_client_test;
 
-import 'package:sockjs_client_wrapper/sockjs_client_wrapper.dart';
 import 'package:test/test.dart';
 
 import 'package:sockjs_client_wrapper/src/client.dart';

test/sockjs_client_wrapper_test.dart

@@ -18,7 +18,6 @@ library sockjs_client.test.sockjs_client_test;
 
 import 'dart:async';
 
-import 'package:sockjs_client_wrapper/sockjs_client_wrapper.dart';
 import 'package:test/test.dart';
 
 import 'package:sockjs_client_wrapper/src/client.dart';
@@ -130,7 +129,9 @@ void _integrationSuite(
         c.complete();
       }
     });
-    client..send('message1')..send('message2');
+    client
+      ..send('message1')
+      ..send('message2');
 
     await c.future;
     client.close();

tool/dart_dev/config.dart

@@ -19,6 +19,7 @@ import 'package:dart_dev/dart_dev.dart';
 
 final config = {
   ...coreConfig,
+  'format': FormatTool()..formatter = Formatter.dartFormat,
   'test': CompoundTool()
     ..addTool(DevTool.fromFunction(startTestServer), alwaysRun: true)
     ..addTool(TestTool(), argMapper: takeAllArgs)