Skip to content

Commit 9242d4a

Browse files
committed
Fix: Resolve Dart 3.5+ and json_serializable 6.9.0+ compatibility issues in generated dart-dio clients
This commit fixes compatibility problems between the generated dart-dio code, json_serializable 6.9.0+, and Dart SDK 3.5 or later. Changes: - Updated `pubspec.mustache`: - Set the minimum SDK constraint for the generated package to `>=3.5.0 <4.0.0`, reflecting the language version used in the generated code. - Bump `json_annotation` dependency to `^4.9.0`. - Bump `json_serializable` dependency to `^6.9.0`. These changes ensure that the generated code: - Is compatible with `json_serializable` 6.9.0+ and Dart SDK 3.5+. - Avoids Dart 3.5+ specific syntax that causes errors on older SDKs. - Maintains existing functionality and type safety. Resolves: #16117, #14863
1 parent 78ea8af commit 9242d4a

File tree

6 files changed

+30
-24
lines changed

6 files changed

+30
-24
lines changed

modules/openapi-generator/src/main/resources/dart/libraries/dio/pubspec.mustache

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,26 @@ repository: {{.}}
99
publish_to: {{.}}
1010
{{/pubPublishTo}}
1111

12+
1213
environment:
13-
sdk: '>={{#useJsonSerializable}}2.17.0{{/useJsonSerializable}}{{^useJsonSerializable}}2.15.0{{/useJsonSerializable}} <4.0.0'
14+
sdk: '>={{^useJsonSerializable}}2.18.0{{/useJsonSerializable}}{{#useJsonSerializable}}3.5.0{{/useJsonSerializable}} <4.0.0'
1415
1516
dependencies:
16-
dio: '^5.2.0'
17+
dio: '^5.7.0'
1718
{{#useBuiltValue}}
1819
one_of: '>=1.5.0 <2.0.0'
1920
one_of_serializer: '>=1.5.0 <2.0.0'
2021
built_value: '>=8.4.0 <9.0.0'
2122
built_collection: '>=5.1.1 <6.0.0'
2223
{{/useBuiltValue}}
2324
{{#useEquatable}}
24-
equatable: '^2.0.5'
25+
equatable: '^2.0.7'
2526
{{/useEquatable}}
2627
{{#useJsonSerializable}}
27-
json_annotation: '^4.4.0'
28+
json_annotation: '^4.9.0'
2829
{{/useJsonSerializable}}
2930
{{#useDateLibTimeMachine}}
30-
time_machine: ^0.9.16
31+
time_machine: ^0.9.17
3132
{{/useDateLibTimeMachine}}
3233
3334
dev_dependencies:
@@ -37,6 +38,6 @@ dev_dependencies:
3738
{{/useBuiltValue}}
3839
{{#useJsonSerializable}}
3940
build_runner: any
40-
json_serializable: '^6.1.5'
41+
json_serializable: '6.9.3'
4142
{{/useJsonSerializable}}
42-
test: ^1.16.0
43+
test: '^1.16.0'

samples/openapi3/client/petstore/dart-dio/oneof/pubspec.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ version: 1.0.0
33
description: OpenAPI API client
44
homepage: homepage
55

6+
67
environment:
7-
sdk: '>=2.15.0 <4.0.0'
8+
sdk: '>=2.18.0 <4.0.0'
89

910
dependencies:
10-
dio: '^5.2.0'
11+
dio: '^5.7.0'
1112
one_of: '>=1.5.0 <2.0.0'
1213
one_of_serializer: '>=1.5.0 <2.0.0'
1314
built_value: '>=8.4.0 <9.0.0'
@@ -16,4 +17,4 @@ dependencies:
1617
dev_dependencies:
1718
built_value_generator: '>=8.4.0 <9.0.0'
1819
build_runner: any
19-
test: ^1.16.0
20+
test: '^1.16.0'

samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/pubspec.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ version: 1.0.0
33
description: OpenAPI API client
44
homepage: homepage
55

6+
67
environment:
7-
sdk: '>=2.15.0 <4.0.0'
8+
sdk: '>=2.18.0 <4.0.0'
89

910
dependencies:
10-
dio: '^5.2.0'
11+
dio: '^5.7.0'
1112
one_of: '>=1.5.0 <2.0.0'
1213
one_of_serializer: '>=1.5.0 <2.0.0'
1314
built_value: '>=8.4.0 <9.0.0'
@@ -16,4 +17,4 @@ dependencies:
1617
dev_dependencies:
1718
built_value_generator: '>=8.4.0 <9.0.0'
1819
build_runner: any
19-
test: ^1.16.0
20+
test: '^1.16.0'

samples/openapi3/client/petstore/dart-dio/oneof_primitive/pubspec.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ version: 1.0.0
33
description: OpenAPI API client
44
homepage: homepage
55

6+
67
environment:
7-
sdk: '>=2.15.0 <4.0.0'
8+
sdk: '>=2.18.0 <4.0.0'
89

910
dependencies:
10-
dio: '^5.2.0'
11+
dio: '^5.7.0'
1112
one_of: '>=1.5.0 <2.0.0'
1213
one_of_serializer: '>=1.5.0 <2.0.0'
1314
built_value: '>=8.4.0 <9.0.0'
@@ -16,4 +17,4 @@ dependencies:
1617
dev_dependencies:
1718
built_value_generator: '>=8.4.0 <9.0.0'
1819
build_runner: any
19-
test: ^1.16.0
20+
test: '^1.16.0'

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/pubspec.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ version: 1.0.0
33
description: OpenAPI API client
44
homepage: homepage
55

6+
67
environment:
7-
sdk: '>=2.17.0 <4.0.0'
8+
sdk: '>=3.5.0 <4.0.0'
89

910
dependencies:
10-
dio: '^5.2.0'
11-
json_annotation: '^4.4.0'
11+
dio: '^5.7.0'
12+
json_annotation: '^4.9.0'
1213

1314
dev_dependencies:
1415
build_runner: any
15-
json_serializable: '^6.1.5'
16-
test: ^1.16.0
16+
json_serializable: '6.9.3'
17+
test: '^1.16.0'

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/pubspec.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ version: 1.0.0
33
description: OpenAPI API client
44
homepage: homepage
55

6+
67
environment:
7-
sdk: '>=2.15.0 <4.0.0'
8+
sdk: '>=2.18.0 <4.0.0'
89

910
dependencies:
10-
dio: '^5.2.0'
11+
dio: '^5.7.0'
1112
one_of: '>=1.5.0 <2.0.0'
1213
one_of_serializer: '>=1.5.0 <2.0.0'
1314
built_value: '>=8.4.0 <9.0.0'
@@ -16,4 +17,4 @@ dependencies:
1617
dev_dependencies:
1718
built_value_generator: '>=8.4.0 <9.0.0'
1819
build_runner: any
19-
test: ^1.16.0
20+
test: '^1.16.0'

0 commit comments

Comments
 (0)