Skip to content

Commit

Permalink
Merge branch '6.0.0' into feature/download-adapter
Browse files Browse the repository at this point in the history
  • Loading branch information
kuhnroyal committed Jan 2, 2024
2 parents 8d1c2d5 + 5b24a75 commit 3eeecfa
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: subosito/[email protected]
with:
cache: true
flutter-version: ${{ matrix.sdk == 'min' && '2.8.0' || '' }}
flutter-version: ${{ matrix.sdk == 'min' && '3.10.0' || '' }}
channel: ${{ matrix.sdk == 'min' && '' || matrix.channel }}
- run: |
chmod +x ./scripts/prepare_pinning_certs.sh
Expand Down
2 changes: 1 addition & 1 deletion dio/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ See the [Migration Guide][] for the complete breaking changes list.**

## Unreleased 6.0.0

- The minimum supported Dart version has been bumped from `2.15.0` to `2.19.0`.
- The minimum supported Dart version has been bumped from `2.15.0` to `3.0.0`.
- Remove `DefaultHttpClientAdapter` which was deprecated in `5.0.0`.
- Remove `IOHttpClientAdapter.onHttpClientCreate` which was deprecated in `5.2.0`.
- Remove `DioError` and `DioErrorType` which was deprecated in `5.2.0`.
Expand Down
2 changes: 1 addition & 1 deletion dio/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repository: https://github.com/cfug/dio/blob/main/dio
issue_tracker: https://github.com/cfug/dio/issues

environment:
sdk: '>=2.19.0 <4.0.0'
sdk: '>=3.0.0 <4.0.0'

dependencies:
async: ^2.8.2
Expand Down
3 changes: 1 addition & 2 deletions example/lib/extend_dio.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import 'package:dio/dio.dart';
import 'package:dio/io.dart';

class HttpService extends Dio {
HttpService([BaseOptions? baseOptions]) : super(baseOptions) {
HttpService([super.baseOptions]) {
options
..baseUrl = 'https://httpbin.org/'
..contentType = Headers.jsonContentType;
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 0.0.1
publish_to: "none"

environment:
sdk: ">=2.16.0 <3.0.0"
sdk: ">=3.0.0 <4.0.0"

dependencies:
cookie_jar:
Expand Down
2 changes: 1 addition & 1 deletion example_flutter_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: ">=2.19.0 <4.0.0"
sdk: ">=3.0.0 <4.0.0"

dependencies:
flutter:
Expand Down
4 changes: 2 additions & 2 deletions plugins/cookie_manager/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ repository: https://github.com/cfug/dio/blob/main/plugins/cookie_manager
issue_tracker: https://github.com/cfug/dio/issues

environment:
sdk: ">=2.19.0 <3.0.0"
sdk: ">=3.0.0 <4.0.0"

dependencies:
cookie_jar: ^4.0.0
dio: ^5.2.0
dio: ^6.0.0

dev_dependencies:
lints: any
Expand Down
4 changes: 2 additions & 2 deletions plugins/http2_adapter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ repository: https://github.com/cfug/dio/blob/main/plugins/http2_adapter
issue_tracker: https://github.com/cfug/dio/issues

environment:
sdk: ">=2.19.0 <3.0.0"
sdk: ">=3.0.0 <4.0.0"

dependencies:
http2: ^2.0.0
dio: ^5.2.0
dio: ^6.0.0

dev_dependencies:
crypto: ^3.0.2
Expand Down
2 changes: 1 addition & 1 deletion plugins/native_dio_adapter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
flutter:
sdk: flutter

dio: ^5.4.0
dio: ^6.0.0
cupertino_http: ^1.0.0
cronet_http: ^0.4.0
http: ^1.0.0
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ publish_to: 'none'
repository: https://github.com/cfug/dio

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

dev_dependencies:
lints: any
Expand Down

0 comments on commit 3eeecfa

Please sign in to comment.