Merge branch 'develop' into chore/merge-dev-branch

# Conflicts: # .github/workflows/publish.yml
lejard-h · May 20, 2023 · 5e944d7 · 5e944d7
2 parents 636dbc3 + 08781c9
commit 5e944d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -29,7 +29,8 @@ jobs:
  - id: checkout
  uses: actions/checkout@v3
  with:
- ref: ${{ github.event.pull_request.base.ref }}
+ fetch-depth: 2
+ - run: git checkout HEAD^
  - name: Load base version
  id: load_base_version
  run: |

diff --git a/chopper_generator/lib/src/generator.dart b/chopper_generator/lib/src/generator.dart
@@ -457,6 +457,7 @@ class ChopperGenerator extends GeneratorForAnnotation<chopper.ChopperApi> {
  _typeChecker(Map).isExactlyType(type) ||
  _typeChecker(BuiltMap).isExactlyType(type)) return type;
 
+ // ignore: deprecated_member_use
  if (generic.isDynamic) return null;
 
  if (_typeChecker(List).isExactlyType(type) ||