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.

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

Bump min SDK to Dart 2.18.0 / Flutter 3.3.0 #27

Merged
merged 2 commits into from
Apr 3, 2024
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
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
cache: true
flutter-version: ${{ matrix.sdk == 'min' && '2.8.0' || '' }}
flutter-version: ${{ matrix.sdk == 'min' && '3.3.0' || '' }}
channel: ${{ matrix.sdk == 'min' && '' || matrix.channel }}
- run: dart pub get
- uses: bluefireteam/melos-action@v3
Expand All @@ -52,6 +52,9 @@ jobs:
echo $(cat .melos_packages) >> $GITHUB_ENV
- name: Melos Bootstrap
run: melos bootstrap
- run: melos -v
- run: ls -la dio
- run: cat dio/pubspec_overrides.yaml
- name: '[Verify step] Format'
if: ${{ matrix.sdk == 'stable' }}
run: melos run format
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.15.0 <4.0.0'
sdk: '>=2.18.0 <4.0.0'

dependencies:
async: ^2.8.2
Expand Down
2 changes: 1 addition & 1 deletion dio_test/lib/src/test/download_tests.dart
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ void downloadTests(
},
// The download of the main.zip file can be slow,
// so we need to increase the timeout.
timeout: Timeout(Duration(minutes: 1)),
timeout: Timeout(Duration(milliseconds: 1)),
);

test('delete on error', () async {
Expand Down
2 changes: 1 addition & 1 deletion dio_test/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/cfug/dio/blob/main/dio_test
issue_tracker: https://github.com/cfug/dio/issues

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

dependencies:
dio: any
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.15.0 <4.0.0"
sdk: ">=2.18.0 <4.0.0"

dependencies:
flutter:
Expand Down
22 changes: 0 additions & 22 deletions melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,6 @@ scripts:
packageFilters:
flutter: false
dirExists: test
# Old syntax for melos <= 2.9.0 - this can be removed once we bump the minimum Dart SDK.
select-package:
flutter: false
dir-exists: test
ignore:
- 'dio_compatibility_layer'
- 'dio_http2_adapter'
test:web:
name: Dart Web tests
run: |
Expand All @@ -91,14 +84,6 @@ scripts:
ignore:
- '*http2*'
- '*cookie*'
# Old syntax for melos <= 2.9.0 - this can be removed once we bump the minimum Dart SDK.
select-package:
flutter: false
dir-exists: test
ignore:
- 'dio_compatibility_layer'
- '*http2*'
- '*cookie*'
test:flutter:
name: Flutter tests
exec: flutter test --coverage
Expand All @@ -107,13 +92,6 @@ scripts:
dirExists: test
ignore:
- '*example*'
# Old syntax for melos <= 2.9.0 - this can be removed once we bump the minimum Dart SDK.
# There is no packages to run on min SDK for this command.
select-package:
flutter: true
dir-exists: test
ignore:
- '*'
test:coverage:
name: Run all tests and display coverage
run: |
Expand Down
2 changes: 1 addition & 1 deletion plugins/cookie_manager/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repository: https://github.com/cfug/dio/blob/main/plugins/cookie_manager
issue_tracker: https://github.com/cfug/dio/issues

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

dependencies:
cookie_jar: ^4.0.0
Expand Down
Loading