Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Resolve Dart 3.5+ and json_serializable 6.9.0+ compatibility issues in generated dart-dio clients #20460

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Resolve Dart 3.5+ and json_serializable 6.9.0+ compatibility issues in generated dart-dio clients #20460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions modules/openapi-generator/src/main/resources/dart/libraries/dio/pubspec.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,26 @@ repository: {{.}}
publish_to: {{.}}
{{/pubPublishTo}}


environment:
sdk: '>={{#useJsonSerializable}}2.17.0{{/useJsonSerializable}}{{^useJsonSerializable}}2.15.0{{/useJsonSerializable}} <4.0.0'
sdk: '>={{^useJsonSerializable}}2.18.0{{/useJsonSerializable}}{{#useJsonSerializable}}3.5.0{{/useJsonSerializable}} <4.0.0'

dependencies:
dio: '^5.2.0'
dio: '^5.7.0'
{{#useBuiltValue}}
one_of: '>=1.5.0 <2.0.0'
one_of_serializer: '>=1.5.0 <2.0.0'
built_value: '>=8.4.0 <9.0.0'
built_collection: '>=5.1.1 <6.0.0'
{{/useBuiltValue}}
{{#useEquatable}}
equatable: '^2.0.5'
equatable: '^2.0.7'
{{/useEquatable}}
{{#useJsonSerializable}}
json_annotation: '^4.4.0'
json_annotation: '^4.9.0'
{{/useJsonSerializable}}
{{#useDateLibTimeMachine}}
time_machine: ^0.9.16
time_machine: ^0.9.17
{{/useDateLibTimeMachine}}

dev_dependencies:
Expand All @@ -37,6 +38,6 @@ dev_dependencies:
{{/useBuiltValue}}
{{#useJsonSerializable}}
build_runner: any
json_serializable: '^6.1.5'
json_serializable: '^6.9.3'
{{/useJsonSerializable}}
test: ^1.16.0
test: '^1.16.0'
7 changes: 4 additions & 3 deletions samples/openapi3/client/petstore/dart-dio/oneof/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ version: 1.0.0
description: OpenAPI API client
homepage: homepage


environment:
sdk: '>=2.15.0 <4.0.0'
sdk: '>=2.18.0 <4.0.0'

dependencies:
dio: '^5.2.0'
dio: '^5.7.0'
one_of: '>=1.5.0 <2.0.0'
one_of_serializer: '>=1.5.0 <2.0.0'
built_value: '>=8.4.0 <9.0.0'
Expand All @@ -16,4 +17,4 @@ dependencies:
dev_dependencies:
built_value_generator: '>=8.4.0 <9.0.0'
build_runner: any
test: ^1.16.0
test: '^1.16.0'
7 changes: 4 additions & 3 deletions samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ version: 1.0.0
description: OpenAPI API client
homepage: homepage


environment:
sdk: '>=2.15.0 <4.0.0'
sdk: '>=2.18.0 <4.0.0'

dependencies:
dio: '^5.2.0'
dio: '^5.7.0'
one_of: '>=1.5.0 <2.0.0'
one_of_serializer: '>=1.5.0 <2.0.0'
built_value: '>=8.4.0 <9.0.0'
Expand All @@ -16,4 +17,4 @@ dependencies:
dev_dependencies:
built_value_generator: '>=8.4.0 <9.0.0'
build_runner: any
test: ^1.16.0
test: '^1.16.0'
7 changes: 4 additions & 3 deletions samples/openapi3/client/petstore/dart-dio/oneof_primitive/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ version: 1.0.0
description: OpenAPI API client
homepage: homepage


environment:
sdk: '>=2.15.0 <4.0.0'
sdk: '>=2.18.0 <4.0.0'

dependencies:
dio: '^5.2.0'
dio: '^5.7.0'
one_of: '>=1.5.0 <2.0.0'
one_of_serializer: '>=1.5.0 <2.0.0'
built_value: '>=8.4.0 <9.0.0'
Expand All @@ -16,4 +17,4 @@ dependencies:
dev_dependencies:
built_value_generator: '>=8.4.0 <9.0.0'
build_runner: any
test: ^1.16.0
test: '^1.16.0'
11 changes: 6 additions & 5 deletions ...openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ version: 1.0.0
description: OpenAPI API client
homepage: homepage


environment:
sdk: '>=2.17.0 <4.0.0'
sdk: '>=3.5.0 <4.0.0'

dependencies:
dio: '^5.2.0'
json_annotation: '^4.4.0'
dio: '^5.7.0'
json_annotation: '^4.9.0'

dev_dependencies:
build_runner: any
json_serializable: '^6.1.5'
test: ^1.16.0
json_serializable: '^6.9.3'
test: '^1.16.0'
7 changes: 4 additions & 3 deletions samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ version: 1.0.0
description: OpenAPI API client
homepage: homepage


environment:
sdk: '>=2.15.0 <4.0.0'
sdk: '>=2.18.0 <4.0.0'

dependencies:
dio: '^5.2.0'
dio: '^5.7.0'
one_of: '>=1.5.0 <2.0.0'
one_of_serializer: '>=1.5.0 <2.0.0'
built_value: '>=8.4.0 <9.0.0'
Expand All @@ -16,4 +17,4 @@ dependencies:
dev_dependencies:
built_value_generator: '>=8.4.0 <9.0.0'
build_runner: any
test: ^1.16.0
test: '^1.16.0'
Loading