Merge pull request #992 from Workiva/fix-stable-ci

FED-4304 Fix stable ci, make generated accessor mixins true mixins

Author: btr-rmconsole-6[bot]

.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)

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

example/boilerplate_versions/dart2_only/basic_component1.over_react.g.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) {