Workiva · btr-rmconsole-6 · Dec 8, 2025 · Dec 3, 2025 · Dec 3, 2025 · Dec 3, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,6 +54,8 @@ jobs:
           if [[ "$DART_VERSION" =~ ^3 ]]; then
             ./tool/delete_dart_2_only_files.sh
             ./tool/update_tests_for_dart_3.sh
+            # Stage these changes so they don't show up in the generated file `git diff` check below
+            git add .
           fi
 
       # Analyze before generated files are created to verify that component boilerplate analysis is "clean" without the need for building
@@ -74,14 +76,8 @@ jobs:
 
       - name: Verify that generated files are up-to-date
         run: |
-          if [ ${{ matrix.sdk }} = '2.19.6' ]; then
-            git diff --exit-code
-          else
-            # Don't check these generated files for other SDKs, since they may generate differently
-            # due to different resolved dependencies.
-            git diff --exit-code -- ":(exclude)test/over_react/component_declaration/redux_component_test/test_reducer.g.dart"
-          fi
-        if: always() && steps.install.outcome == 'success' && steps.install.build == 'success'
+          git diff --exit-code
+        if: always() && steps.install.outcome == 'success' && steps.build.outcome == 'success'
 
       # Analyze again after generated files are created to verify that those generated classes don't cause analysis errors
       - name: Analyze project source (post-build)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # OverReact Changelog
 
+## Unreleased
+- [#992] Fix compilation errors for legacy boilerplate defined in libraries with a Dart language version of >=3.0
+
 ## 5.4.6
 - [#986] Set up gha-dart-oss
 - [#985] Remove entrypoint imports

diff --git a/example/boilerplate_versions/dart2_only/basic_component1.over_react.g.dart b/example/boilerplate_versions/dart2_only/basic_component1.over_react.g.dart
diff --git a/example/boilerplate_versions/dart2_only/basic_component2.over_react.g.dart b/example/boilerplate_versions/dart2_only/basic_component2.over_react.g.dart
diff --git a/lib/src/builder/codegen/accessors_generator.dart b/lib/src/builder/codegen/accessors_generator.dart
@@ -82,7 +82,7 @@ abstract class TypedMapAccessorsGenerator extends BoilerplateDeclarationGenerato
       final implementsClause = 'implements ${names.consumerName}$typeParamsOnSuper';
       generatedClass
         ..write(generatedCodeUseOnlyDeprecation)
-        ..writeln('abstract class $accessorsMixinName$typeParamsOnClass $implementsClause {\n'
+        ..writeln('mixin $accessorsMixinName$typeParamsOnClass $implementsClause {\n'
             '  @override'
             '  Map get ${type.isProps ? 'props' : 'state'};\n');
       if (type.isMixin) {

diff --git a/lib/src/component/_deprecated/abstract_transition.over_react.g.dart b/lib/src/component/_deprecated/abstract_transition.over_react.g.dart
diff --git a/lib/src/component/_deprecated/abstract_transition_props.over_react.g.dart b/lib/src/component/_deprecated/abstract_transition_props.over_react.g.dart
diff --git a/lib/src/component/_deprecated/error_boundary.over_react.g.dart b/lib/src/component/_deprecated/error_boundary.over_react.g.dart
diff --git a/lib/src/component/_deprecated/error_boundary_mixins.over_react.g.dart b/lib/src/component/_deprecated/error_boundary_mixins.over_react.g.dart
diff --git a/lib/src/component/_deprecated/error_boundary_recoverable.over_react.g.dart b/lib/src/component/_deprecated/error_boundary_recoverable.over_react.g.dart
diff --git a/lib/src/component/_deprecated/resize_sensor.over_react.g.dart b/lib/src/component/_deprecated/resize_sensor.over_react.g.dart
diff --git a/lib/src/component/aria_mixin.over_react.g.dart b/lib/src/component/aria_mixin.over_react.g.dart
diff --git a/lib/src/component/dummy_component2.over_react.g.dart b/lib/src/component/dummy_component2.over_react.g.dart
diff --git a/lib/src/component/prop_mixins.over_react.g.dart b/lib/src/component/prop_mixins.over_react.g.dart
diff --git a/lib/src/over_react_redux/over_react_flux.over_react.g.dart b/lib/src/over_react_redux/over_react_flux.over_react.g.dart
diff --git a/lib/src/over_react_redux/over_react_redux.over_react.g.dart b/lib/src/over_react_redux/over_react_redux.over_react.g.dart
diff --git a/lib/src/over_react_redux/redux_multi_provider.over_react.g.dart b/lib/src/over_react_redux/redux_multi_provider.over_react.g.dart
diff --git a/lib/src/util/class_names.over_react.g.dart b/lib/src/util/class_names.over_react.g.dart
diff --git a/test/over_react/component/_deprecated/abstract_transition_test.over_react.g.dart b/test/over_react/component/_deprecated/abstract_transition_test.over_react.g.dart
diff --git a/...er_react/component/_deprecated/fixtures/custom_error_boundary_component.over_react.g.dart b/...er_react/component/_deprecated/fixtures/custom_error_boundary_component.over_react.g.dart
diff --git a/test/over_react/component/error_boundary/shared_stack_tests.over_react.g.dart b/test/over_react/component/error_boundary/shared_stack_tests.over_react.g.dart
diff --git a/test/over_react/component/fixtures/basic_child_component.over_react.g.dart b/test/over_react/component/fixtures/basic_child_component.over_react.g.dart
diff --git a/test/over_react/component/fixtures/basic_ui_component.over_react.g.dart b/test/over_react/component/fixtures/basic_ui_component.over_react.g.dart
diff --git a/test/over_react/component/fixtures/context_provider_component.over_react.g.dart b/test/over_react/component/fixtures/context_provider_component.over_react.g.dart
diff --git a/test/over_react/component/fixtures/dummy_component.over_react.g.dart b/test/over_react/component/fixtures/dummy_component.over_react.g.dart
diff --git a/test/over_react/component/fixtures/flawed_component.over_react.g.dart b/test/over_react/component/fixtures/flawed_component.over_react.g.dart
diff --git a/test/over_react/component/fixtures/flawed_component_on_mount.over_react.g.dart b/test/over_react/component/fixtures/flawed_component_on_mount.over_react.g.dart
diff --git a/test/over_react/component/fixtures/flawed_component_that_renders_a_string.over_react.g.dart b/test/over_react/component/fixtures/flawed_component_that_renders_a_string.over_react.g.dart
diff --git a/test/over_react/component/fixtures/flawed_component_that_renders_nothing.over_react.g.dart b/test/over_react/component/fixtures/flawed_component_that_renders_nothing.over_react.g.dart