Merge remote-tracking branch 'origin/master' into null-safety

.github/workflows/dart_ci.yml

@@ -51,7 +51,7 @@ jobs:
         timeout-minutes: 6
         name: Build generated files / precompile DDC assets
         run: |
-          dart pub run build_runner build --delete-conflicting-outputs -o ddc_precompiled
+          dart run build_runner build --delete-conflicting-outputs -o ddc_precompiled
         if: always() && steps.install.outcome == 'success'
 
       - name: Verify that generated files are up-to-date
@@ -81,7 +81,7 @@ jobs:
         if: always() && steps.install.outcome == 'success' && steps.build.outcome == 'success'
 
       - name: Run tests (dart2js)
-        run: dart pub run dart_dev test --build-args="-r" -P dart2js
+        run: dart run dart_dev test --build-args="-r" -P dart2js
         if: always() && steps.install.outcome == 'success' && steps.build.outcome == 'success'
 
   validate_analyzer:
@@ -104,7 +104,7 @@ jobs:
       - name: Print Dart SDK version
         run: dart --version
 
-      - name: Update analyzer constraint to ${{ matrix.analyzer }} and validate `pub get` can resolve
+      - name: Update analyzer constraint to ${{ matrix.analyzer }} and validate `dart pub get` can resolve
         id: resolve
         run: |
           dart tool/set_analyzer_constraint.dart "${{ matrix.analyzer }}"
@@ -119,7 +119,7 @@ jobs:
         run: dart run build_runner build --build-filter='**.dart' --delete-conflicting-outputs
 
       - name: Run builder tests
-        run: dart run test -p vm -- test/vm_tests/builder
+        run: dart test -p vm -- test/vm_tests/builder
 
   analyzer_plugin:
     runs-on: ubuntu-latest
@@ -154,9 +154,9 @@ jobs:
         if: always() && steps.install.outcome == 'success'
 
       - name: Verify formatting
-        run: dart pub run dart_dev format --check
+        run: dart run dart_dev format --check
         if: always() && matrix.sdk == '2.7.2' && steps.install.outcome == 'success'
 
       - name: Run tests
-        run: dart pub run dart_dev test
+        run: dart run dart_dev test
         if: always() && steps.install.outcome == 'success'

CHANGELOG.md

@@ -25,6 +25,9 @@
     - ReduxProviderProps (for extension, mix in ReduxProviderPropsMixin instead)
 - `PropsMeta`/`StateMeta` constructor arguments `fields` and `keys` are now required
 
+## [4.10.3](https://github.com/Workiva/over_react/compare/4.10.2...4.10.3)
+- [#846] Update internals to prepare for react-dart 7.0.0
+
 ## [4.10.2](https://github.com/Workiva/over_react/compare/4.10.0...4.10.2)
 - [#835] Upgrade dependencies, notably jumping to analyzer 5.x
      - analyzer: `^5.1.0` (was `>=1.7.2 <3.0.0`)

Dockerfile

@@ -1,4 +1,4 @@
-FROM dart:2.18
+FROM dart:2.19.6
 
 # Expose env vars for git ssh access
 ARG GIT_SSH_KEY

pubspec.yaml

@@ -1,5 +1,5 @@
 name: over_react
-version: 4.10.2
+version: 4.10.4
 description: A library for building statically-typed React UI components using Dart.
 homepage: https://github.com/Workiva/over_react/
 environment:
@@ -15,7 +15,7 @@ dependencies:
   meta: ^1.6.0
   path: ^1.5.1
   react: ^7.0.0
-  redux: ">=5.0.0 <6.0.0"
+  redux: '>=5.0.0 <6.0.0'
   source_span: ^1.4.1
   transformer_utils: ^0.2.6
   w_common: ^3.0.0

tools/analyzer_plugin/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   # Upon release, this should be pinned to the over_react version from ../../pubspec.yaml
   # so that it always resolves to the same version of over_react that the user has pulled in,
   # and thus has the same boilerplate parsing code that's running in the builder.
-  over_react: 4.10.2
+  over_react: 4.10.4
   path: ^1.5.1
   source_span: ^1.7.0
   yaml: ^3.0.0