Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions .github/actions/setup-flutter/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@ runs:
- name: 🐦 Setup Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: '3.22.2'
flutter-version: '3.32.0'
cache: true

- name: 📦 Get dependencies
shell: bash
run: flutter pub get

- name: ☕️ Set up JDK 17
- name: ☕️ Set up JDK 21
uses: actions/setup-java@v1
with:
java-version: '17'
distribution: 'temurin'
java-version: '21'

- name: 🔎 Check Flutter environment
shell: bash
Expand Down
69 changes: 34 additions & 35 deletions lib/extensions/base_request.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,39 +33,38 @@ extension BaseRequestCopyWith on BaseRequest {
List<MultipartFile>? files,
// StreamedRequest only properties.
Stream<List<int>>? stream,
}) =>
switch (this) {
Request req => req.copyWith(
method: method,
url: url,
headers: headers,
body: body,
encoding: encoding,
followRedirects: followRedirects,
maxRedirects: maxRedirects,
persistentConnection: persistentConnection,
),
StreamedRequest req => req.copyWith(
method: method,
url: url,
headers: headers,
stream: stream,
followRedirects: followRedirects,
maxRedirects: maxRedirects,
persistentConnection: persistentConnection,
),
MultipartRequest req => req.copyWith(
method: method,
url: url,
headers: headers,
fields: fields,
files: files,
followRedirects: followRedirects,
maxRedirects: maxRedirects,
persistentConnection: persistentConnection,
),
_ => throw UnsupportedError(
'Cannot copy unsupported type of request $runtimeType',
),
};
}) => switch (this) {
Request req => req.copyWith(
method: method,
url: url,
headers: headers,
body: body,
encoding: encoding,
followRedirects: followRedirects,
maxRedirects: maxRedirects,
persistentConnection: persistentConnection,
),
StreamedRequest req => req.copyWith(
method: method,
url: url,
headers: headers,
stream: stream,
followRedirects: followRedirects,
maxRedirects: maxRedirects,
persistentConnection: persistentConnection,
),
MultipartRequest req => req.copyWith(
method: method,
url: url,
headers: headers,
fields: fields,
files: files,
followRedirects: followRedirects,
maxRedirects: maxRedirects,
persistentConnection: persistentConnection,
),
_ => throw UnsupportedError(
'Cannot copy unsupported type of request $runtimeType',
),
};
}
71 changes: 35 additions & 36 deletions lib/extensions/base_response_io.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,40 +32,39 @@ extension BaseResponseCopyWith on BaseResponse {
int? contentLength,
// `IOStreamedResponse` only properties.
HttpClientResponse? inner,
}) =>
switch (this) {
Response res => res.copyWith(
statusCode: statusCode,
body: body,
request: request,
headers: headers,
isRedirect: isRedirect,
persistentConnection: persistentConnection,
reasonPhrase: reasonPhrase,
),
IOStreamedResponse res => res.copyWith(
stream: stream,
statusCode: statusCode,
contentLength: contentLength,
request: request,
headers: headers,
isRedirect: isRedirect,
persistentConnection: persistentConnection,
reasonPhrase: reasonPhrase,
inner: inner,
),
StreamedResponse res => res.copyWith(
stream: stream,
statusCode: statusCode,
contentLength: contentLength,
request: request,
headers: headers,
isRedirect: isRedirect,
persistentConnection: persistentConnection,
reasonPhrase: reasonPhrase,
),
_ => throw UnsupportedError(
'Cannot copy unsupported type of response $runtimeType',
),
};
}) => switch (this) {
Response res => res.copyWith(
statusCode: statusCode,
body: body,
request: request,
headers: headers,
isRedirect: isRedirect,
persistentConnection: persistentConnection,
reasonPhrase: reasonPhrase,
),
IOStreamedResponse res => res.copyWith(
stream: stream,
statusCode: statusCode,
contentLength: contentLength,
request: request,
headers: headers,
isRedirect: isRedirect,
persistentConnection: persistentConnection,
reasonPhrase: reasonPhrase,
inner: inner,
),
StreamedResponse res => res.copyWith(
stream: stream,
statusCode: statusCode,
contentLength: contentLength,
request: request,
headers: headers,
isRedirect: isRedirect,
persistentConnection: persistentConnection,
reasonPhrase: reasonPhrase,
),
_ => throw UnsupportedError(
'Cannot copy unsupported type of response $runtimeType',
),
};
}
49 changes: 24 additions & 25 deletions lib/extensions/base_response_none.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,28 @@ extension BaseResponseCopyWith on BaseResponse {
// `StreamedResponse` only properties.
Stream<List<int>>? stream,
int? contentLength,
}) =>
switch (this) {
Response res => res.copyWith(
statusCode: statusCode,
body: body,
request: request,
headers: headers,
isRedirect: isRedirect,
persistentConnection: persistentConnection,
reasonPhrase: reasonPhrase,
),
StreamedResponse res => res.copyWith(
stream: stream,
statusCode: statusCode,
contentLength: contentLength,
request: request,
headers: headers,
isRedirect: isRedirect,
persistentConnection: persistentConnection,
reasonPhrase: reasonPhrase,
),
_ => throw UnsupportedError(
'Cannot copy unsupported type of response $runtimeType',
),
};
}) => switch (this) {
Response res => res.copyWith(
statusCode: statusCode,
body: body,
request: request,
headers: headers,
isRedirect: isRedirect,
persistentConnection: persistentConnection,
reasonPhrase: reasonPhrase,
),
StreamedResponse res => res.copyWith(
stream: stream,
statusCode: statusCode,
contentLength: contentLength,
request: request,
headers: headers,
isRedirect: isRedirect,
persistentConnection: persistentConnection,
reasonPhrase: reasonPhrase,
),
_ => throw UnsupportedError(
'Cannot copy unsupported type of response $runtimeType',
),
};
}
23 changes: 11 additions & 12 deletions lib/extensions/io_streamed_response.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@ extension IOStreamedResponseCopyWith on IOStreamedResponse {
bool? persistentConnection,
String? reasonPhrase,
HttpClientResponse? inner,
}) =>
IOStreamedResponse(
stream ?? this.stream,
statusCode ?? this.statusCode,
contentLength: contentLength ?? this.contentLength,
request: request ?? this.request,
headers: headers ?? this.headers,
isRedirect: isRedirect ?? this.isRedirect,
persistentConnection: persistentConnection ?? this.persistentConnection,
reasonPhrase: reasonPhrase ?? this.reasonPhrase,
inner: inner,
);
}) => IOStreamedResponse(
stream ?? this.stream,
statusCode ?? this.statusCode,
contentLength: contentLength ?? this.contentLength,
request: request ?? this.request,
headers: headers ?? this.headers,
isRedirect: isRedirect ?? this.isRedirect,
persistentConnection: persistentConnection ?? this.persistentConnection,
reasonPhrase: reasonPhrase ?? this.reasonPhrase,
inner: inner,
);
}
16 changes: 9 additions & 7 deletions lib/extensions/multipart_request.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@ extension MultipartRequestCopyWith on MultipartRequest {
..fields.addAll(fields ?? this.fields);

for (final MultipartFile file in this.files) {
clonedRequest.files.add(MultipartFile(
file.field,
file.finalize(),
file.length,
filename: file.filename,
contentType: file.contentType,
));
clonedRequest.files.add(
MultipartFile(
file.field,
file.finalize(),
file.length,
filename: file.filename,
contentType: file.contentType,
),
);
}

this.persistentConnection =
Expand Down
19 changes: 9 additions & 10 deletions lib/extensions/response.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ extension ResponseCopyWith on Response {
bool? isRedirect,
bool? persistentConnection,
String? reasonPhrase,
}) =>
Response(
body ?? this.body,
statusCode ?? this.statusCode,
request: request ?? this.request,
headers: headers ?? this.headers,
isRedirect: isRedirect ?? this.isRedirect,
persistentConnection: persistentConnection ?? this.persistentConnection,
reasonPhrase: reasonPhrase ?? this.reasonPhrase,
);
}) => Response(
body ?? this.body,
statusCode ?? this.statusCode,
request: request ?? this.request,
headers: headers ?? this.headers,
isRedirect: isRedirect ?? this.isRedirect,
persistentConnection: persistentConnection ?? this.persistentConnection,
reasonPhrase: reasonPhrase ?? this.reasonPhrase,
);
}
7 changes: 4 additions & 3 deletions lib/extensions/streamed_request.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ extension StreamedRequestCopyWith on StreamedRequest {
bool? persistentConnection,
}) {
// Create a new StreamedRequest with the same method and URL
final StreamedRequest clonedRequest =
StreamedRequest(method?.asString ?? this.method, url ?? this.url)
..headers.addAll(headers ?? this.headers);
final StreamedRequest clonedRequest = StreamedRequest(
method?.asString ?? this.method,
url ?? this.url,
)..headers.addAll(headers ?? this.headers);

// Use a broadcast stream to allow multiple listeners
final Stream<List<int>> broadcastStream =
Expand Down
21 changes: 10 additions & 11 deletions lib/extensions/streamed_response.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@ extension StreamedResponseCopyWith on StreamedResponse {
bool? isRedirect,
bool? persistentConnection,
String? reasonPhrase,
}) =>
StreamedResponse(
stream ?? this.stream,
statusCode ?? this.statusCode,
contentLength: contentLength ?? this.contentLength,
request: request ?? this.request,
headers: headers ?? this.headers,
isRedirect: isRedirect ?? this.isRedirect,
persistentConnection: persistentConnection ?? this.persistentConnection,
reasonPhrase: reasonPhrase ?? this.reasonPhrase,
);
}) => StreamedResponse(
stream ?? this.stream,
statusCode ?? this.statusCode,
contentLength: contentLength ?? this.contentLength,
request: request ?? this.request,
headers: headers ?? this.headers,
isRedirect: isRedirect ?? this.isRedirect,
persistentConnection: persistentConnection ?? this.persistentConnection,
reasonPhrase: reasonPhrase ?? this.reasonPhrase,
);
}
24 changes: 10 additions & 14 deletions lib/extensions/uri.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,14 @@ extension AddParameters on Uri {
/// Returns a new [Uri] instance based on `this` and adds [parameters].
Uri addParameters([Map<String, dynamic>? parameters]) =>
parameters?.isNotEmpty ?? false
? (StringBuffer()
..writeAll([
buildUrlString(
"$origin$path",
{
...queryParametersAll,
...?parameters,
},
),
if (fragment.isNotEmpty) '#$fragment',
]))
.toString()
.toUri()
: this;
? (StringBuffer()..writeAll([
buildUrlString("$origin$path", {
...queryParametersAll,
...?parameters,
}),
if (fragment.isNotEmpty) '#$fragment',
]))
.toString()
.toUri()
: this;
}
Loading
Loading