diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml index d989ea3d6..277f0f082 100644 --- a/.github/workflows/dart_ci.yml +++ b/.github/workflows/dart_ci.yml @@ -53,7 +53,12 @@ jobs: name: Build generated files / precompile DDC assets run: | pub run build_runner build --delete-conflicting-outputs -o ddc_precompiled - git diff --exit-code + if [ ${{ matrix.sdk }} = '2.7.2' ]; then + git diff --exit-code + else + # Exclude built_redux generated files since they get generated differently in Dart 2.7 vs other versions + git diff --exit-code -- ":(exclude)test/over_react/component_declaration/redux_component_test/test_reducer.g.dart" + fi if: always() && steps.install.outcome == 'success' # Analyze again after generated files are created to verify that those generated classes don't cause analysis errors diff --git a/pubspec.yaml b/pubspec.yaml index 6aa65bcf2..789b04f38 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,10 +7,13 @@ environment: dependencies: collection: ^1.14.11 - analyzer: '>=0.35.0 <0.40.0' + # Dart 2.7 needs 0.39.x to resolve, + # and Dart 2.12+ needs 0.42.x to resolve to build_web_compilers 2.12.0, etc. + # to enable proper opting out of null-safety. + analyzer: '>=0.39.0 <0.42.0' build: ^1.0.0 built_redux: ^7.4.2 - built_value: '>=5.4.4 <8.0.0' + built_value: '>=6.8.2 <9.0.0' dart_style: ^1.2.5 js: ^0.6.1+1 logging: ">=0.11.3+2 <1.0.0" @@ -20,7 +23,7 @@ dependencies: react: ^6.0.0 redux: ">=3.0.0 <5.0.0" source_span: ^1.4.1 - transformer_utils: ^0.2.0 + transformer_utils: ^0.2.6 w_common: ^1.13.0 w_flux: ^2.10.4 platform_detect: ^1.3.4 @@ -32,16 +35,16 @@ dev_dependencies: build_runner: ^1.7.1 build_test: ^0.10.9 build_web_compilers: ^2.5.1 - built_value_generator: '>=6.0.0 <8.0.0' + built_value_generator: '>=7.0.0 <9.0.0' dart2_constant: ^1.0.0 - dart_dev: ^3.0.0 + dart_dev: ^3.6.4 dependency_validator: ^1.4.0 glob: ^1.2.0 io: ^0.3.2+1 mockito: ^4.1.1 over_react_test: ^2.10.2 pedantic: ^1.8.0 - test: ^1.9.1 + test: ^1.15.7 yaml: ^2.2.1 workiva: diff --git a/test/over_react_redux/hooks/use_selector_test.dart b/test/over_react_redux/hooks/use_selector_test.dart index 9046f1c1f..b07d86838 100644 --- a/test/over_react_redux/hooks/use_selector_test.dart +++ b/test/over_react_redux/hooks/use_selector_test.dart @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import 'dart:developer'; - import 'package:over_react/over_react.dart'; import 'package:over_react/over_react_redux.dart'; import 'package:redux/redux.dart';