diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 0e97fbb4..24852072 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -134,7 +134,7 @@ jobs: if: "always() && steps.chopper_pub_upgrade.conclusion == 'success'" working-directory: chopper - name: Upload coverage to codecov.io - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: files: chopper/coverage/lcov.info fail_ci_if_error: true @@ -149,7 +149,7 @@ jobs: if: "always() && steps.chopper_built_value_pub_upgrade.conclusion == 'success'" working-directory: chopper_built_value - name: Upload coverage to codecov.io - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: files: chopper_built_value/coverage/lcov.info fail_ci_if_error: true @@ -164,7 +164,7 @@ jobs: if: "always() && steps.chopper_generator_pub_upgrade.conclusion == 'success'" working-directory: chopper_generator - name: Upload coverage to codecov.io - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: files: chopper_generator/coverage/lcov.info fail_ci_if_error: true diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 478734f5..64412035 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -104,10 +104,7 @@ jobs: id: publish if: ${{ env.IS_VERSION_GREATER == 1 }} working-directory: ${{ matrix.package }} - run: | - set -e - yq -i 'del(.dependency_overrides)' pubspec.yaml - dart pub publish --force + run: dart pub publish --force - name: Github release id: github_release if: ${{ env.IS_VERSION_GREATER == 1 }} diff --git a/.github/workflows/publish_dry_run.yml b/.github/workflows/publish_dry_run.yml index 8a23a866..013f2270 100644 --- a/.github/workflows/publish_dry_run.yml +++ b/.github/workflows/publish_dry_run.yml @@ -94,10 +94,7 @@ jobs: id: publish_dry_run if: ${{ env.IS_VERSION_GREATER == 1 }} working-directory: ${{ matrix.package }} - run: | - set -e - yq -i 'del(.dependency_overrides)' pubspec.yaml - dart pub publish --dry-run + run: dart pub publish --dry-run - name: Skip publish (dry run) id: skip_publish_dry_run if: ${{ env.IS_VERSION_GREATER == 0 }} diff --git a/chopper/CHANGELOG.md b/chopper/CHANGELOG.md index d4bcc13f..f1902468 100644 --- a/chopper/CHANGELOG.md +++ b/chopper/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 8.0.4 + +- Update dependencies + ## 8.0.3 - Remove unnecessary library name diff --git a/chopper/example/definition.chopper.dart b/chopper/example/definition.chopper.dart index 4ee6e510..c1ad3fa4 100644 --- a/chopper/example/definition.chopper.dart +++ b/chopper/example/definition.chopper.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'definition.dart'; diff --git a/chopper/example/tag.chopper.dart b/chopper/example/tag.chopper.dart index 77f07fa9..a7a493dc 100644 --- a/chopper/example/tag.chopper.dart +++ b/chopper/example/tag.chopper.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'tag.dart'; diff --git a/chopper/lib/src/request.dart b/chopper/lib/src/request.dart index 511fca01..cb51c4ee 100644 --- a/chopper/lib/src/request.dart +++ b/chopper/lib/src/request.dart @@ -10,6 +10,7 @@ import 'package:qs_dart/qs_dart.dart' show ListFormat; /// {@template request} /// This class represents an HTTP request that can be made with Chopper. /// {@endtemplate} +// ignore: must_be_immutable base class Request extends http.BaseRequest with EquatableMixin { final Uri uri; final Uri baseUri; diff --git a/chopper/pubspec.yaml b/chopper/pubspec.yaml index eae0f83b..97bd3259 100644 --- a/chopper/pubspec.yaml +++ b/chopper/pubspec.yaml @@ -1,6 +1,6 @@ name: chopper description: Chopper is an http client generator using source_gen, inspired by Retrofit -version: 8.0.3 +version: 8.0.4 documentation: https://hadrien-lejard.gitbook.io/chopper repository: https://github.com/lejard-h/chopper @@ -12,7 +12,7 @@ dependencies: http: ^1.1.0 logging: ^1.2.0 meta: ^1.9.1 - qs_dart: ^1.2.4 + qs_dart: ^1.3.0 dev_dependencies: build_runner: ^2.4.9 @@ -26,11 +26,7 @@ dev_dependencies: lints: ">=4.0.0 <6.0.0" test: ^1.25.5 transparent_image: ^2.0.1 - chopper_generator: ^8.0.2 - -dependency_overrides: - chopper_generator: - path: ../chopper_generator + chopper_generator: ^8.0.3 topics: - api diff --git a/chopper/pubspec_overrides.yaml b/chopper/pubspec_overrides.yaml new file mode 100644 index 00000000..70472574 --- /dev/null +++ b/chopper/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# Development-only path for chopper_generator +dependency_overrides: + chopper_generator: + path: ../chopper_generator diff --git a/chopper/test/test_service.chopper.dart b/chopper/test/test_service.chopper.dart index 6d3f5585..729ba522 100644 --- a/chopper/test/test_service.chopper.dart +++ b/chopper/test/test_service.chopper.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'test_service.dart'; diff --git a/chopper/test/test_service_base_url.chopper.dart b/chopper/test/test_service_base_url.chopper.dart index 262d72c7..714e8de4 100644 --- a/chopper/test/test_service_base_url.chopper.dart +++ b/chopper/test/test_service_base_url.chopper.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'test_service_base_url.dart'; diff --git a/chopper/test/test_service_variable.chopper.dart b/chopper/test/test_service_variable.chopper.dart index c60e766e..7e26c26e 100644 --- a/chopper/test/test_service_variable.chopper.dart +++ b/chopper/test/test_service_variable.chopper.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'test_service_variable.dart'; diff --git a/chopper/test/test_without_response_service.chopper.dart b/chopper/test/test_without_response_service.chopper.dart index 2bc8fcbd..a608b190 100644 --- a/chopper/test/test_without_response_service.chopper.dart +++ b/chopper/test/test_without_response_service.chopper.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'test_without_response_service.dart'; diff --git a/chopper_built_value/CHANGELOG.md b/chopper_built_value/CHANGELOG.md index b8394384..4657eaa4 100644 --- a/chopper_built_value/CHANGELOG.md +++ b/chopper_built_value/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 3.0.3 + +- Update dependencies + ## 3.0.2 - Remove unnecessary library name diff --git a/chopper_built_value/pubspec.yaml b/chopper_built_value/pubspec.yaml index ee119d77..6652c445 100644 --- a/chopper_built_value/pubspec.yaml +++ b/chopper_built_value/pubspec.yaml @@ -1,6 +1,6 @@ name: chopper_built_value description: A built_value based Converter for Chopper. -version: 3.0.2 +version: 3.0.3 documentation: https://hadrien-lejard.gitbook.io/chopper/converters/built-value-converter repository: https://github.com/lejard-h/chopper @@ -10,7 +10,7 @@ environment: dependencies: built_value: ^8.9.2 built_collection: ^5.1.1 - chopper: ^8.0.2 + chopper: ^8.0.3 http: ^1.1.0 dev_dependencies: @@ -20,10 +20,6 @@ dev_dependencies: built_value_generator: ^8.9.2 lints: ">=4.0.0 <6.0.0" -dependency_overrides: - chopper: - path: ../chopper - topics: - codegen - converter diff --git a/chopper_built_value/pubspec_overrides.yaml b/chopper_built_value/pubspec_overrides.yaml new file mode 100644 index 00000000..9df32d25 --- /dev/null +++ b/chopper_built_value/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# Development-only path for chopper +dependency_overrides: + chopper: + path: ../chopper diff --git a/chopper_generator/CHANGELOG.md b/chopper_generator/CHANGELOG.md index 1ea8584a..9b440972 100644 --- a/chopper_generator/CHANGELOG.md +++ b/chopper_generator/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 8.0.4 + +- Update dependencies + ## 8.0.3 - Remove unnecessary library name diff --git a/chopper_generator/lib/src/generator.dart b/chopper_generator/lib/src/generator.dart index 3a4f697c..986314bf 100644 --- a/chopper_generator/lib/src/generator.dart +++ b/chopper_generator/lib/src/generator.dart @@ -12,7 +12,6 @@ import 'package:chopper_generator/src/extensions.dart'; import 'package:chopper_generator/src/utils.dart'; import 'package:chopper_generator/src/vars.dart'; import 'package:code_builder/code_builder.dart'; -import 'package:dart_style/dart_style.dart'; import 'package:logging/logging.dart'; import 'package:source_gen/source_gen.dart'; @@ -101,7 +100,7 @@ final class ChopperGenerator '// ignore_for_file: type=lint'; final DartEmitter emitter = DartEmitter(useNullSafetySyntax: true); - return DartFormatter().format('$ignore\n${classBuilder.accept(emitter)}'); + return '$ignore\n${classBuilder.accept(emitter)}'; } static Constructor _generateConstructor() => Constructor( @@ -518,8 +517,8 @@ final class ChopperGenerator } static String _factoryForFunction(FunctionTypedElement function) => - function.enclosingElement is ClassElement - ? '${function.enclosingElement!.name}.${function.name}' + function.enclosingElement3 is ClassElement + ? '${function.enclosingElement3!.name}.${function.name}' : function.name!; static Map _getAnnotation( @@ -636,12 +635,16 @@ final class ChopperGenerator if (generic == null || _typeChecker(Map).isExactlyType(type) || - _typeChecker(BuiltMap).isExactlyType(type)) return type; + _typeChecker(BuiltMap).isExactlyType(type)) { + return type; + } - if (generic.isDynamic) return null; + if (generic is DynamicType) return null; if (_typeChecker(List).isExactlyType(type) || - _typeChecker(BuiltList).isExactlyType(type)) return generic; + _typeChecker(BuiltList).isExactlyType(type)) { + return generic; + } return _getResponseInnerType(generic); } diff --git a/chopper_generator/pubspec.yaml b/chopper_generator/pubspec.yaml index fcc3ed7e..7fc7dea0 100644 --- a/chopper_generator/pubspec.yaml +++ b/chopper_generator/pubspec.yaml @@ -1,6 +1,6 @@ name: chopper_generator description: Chopper is an http client generator using source_gen, inspired by Retrofit -version: 8.0.3 +version: 8.0.4 documentation: https://hadrien-lejard.gitbook.io/chopper repository: https://github.com/lejard-h/chopper @@ -8,15 +8,14 @@ environment: sdk: ^3.0.0 dependencies: - analyzer: ^6.4.1 + analyzer: ">=6.9.0 <8.0.0" build: ^2.4.1 built_collection: ^5.1.1 - chopper: ^8.0.2 + chopper: ^8.0.3 code_builder: ^4.10.0 - dart_style: ^2.3.6 logging: ^1.2.0 meta: ^1.9.1 - source_gen: ^1.5.0 + source_gen: ">=1.5.0 <3.0.0" yaml: ^3.1.2 collection: ^1.18.0 @@ -27,10 +26,6 @@ dev_dependencies: lints: ">=4.0.0 <6.0.0" test: ^1.25.5 -dependency_overrides: - chopper: - path: ../chopper - topics: - api - codegen diff --git a/chopper_generator/pubspec_overrides.yaml b/chopper_generator/pubspec_overrides.yaml new file mode 100644 index 00000000..9df32d25 --- /dev/null +++ b/chopper_generator/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# Development-only path for chopper +dependency_overrides: + chopper: + path: ../chopper diff --git a/chopper_generator/test/test_service.chopper.dart b/chopper_generator/test/test_service.chopper.dart index 864baf78..57c3a382 100644 --- a/chopper_generator/test/test_service.chopper.dart +++ b/chopper_generator/test/test_service.chopper.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'test_service.dart'; diff --git a/chopper_generator/test/test_service_variable.chopper.dart b/chopper_generator/test/test_service_variable.chopper.dart index c60e766e..7e26c26e 100644 --- a/chopper_generator/test/test_service_variable.chopper.dart +++ b/chopper_generator/test/test_service_variable.chopper.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'test_service_variable.dart'; diff --git a/chopper_generator/test/test_without_response_service.chopper.dart b/chopper_generator/test/test_without_response_service.chopper.dart index 2bc8fcbd..a608b190 100644 --- a/chopper_generator/test/test_without_response_service.chopper.dart +++ b/chopper_generator/test/test_without_response_service.chopper.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'test_without_response_service.dart';