diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c080052bb..3e35a51a9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -139,7 +139,7 @@ jobs: uses: subosito/flutter-action@v2.8.0 with: cache: true - flutter-version: ${{ matrix.channel == 'min' && '3.3.0' || '' }} + flutter-version: ${{ matrix.channel == 'min' && '3.7.0' || '' }} channel: ${{ matrix.channel == 'min' && 'stable' || matrix.channel }} - run: flutter test diff --git a/plugins/native_dio_adapter/CHANGELOG.md b/plugins/native_dio_adapter/CHANGELOG.md index a4b11f7a0..f26583eeb 100644 --- a/plugins/native_dio_adapter/CHANGELOG.md +++ b/plugins/native_dio_adapter/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased +- Bump cupertino_http and cronet_http versions. - Improve code formats according to linter rules. ## 0.0.1 diff --git a/plugins/native_dio_adapter/lib/native_dio_adapter.dart b/plugins/native_dio_adapter/lib/native_dio_adapter.dart index 3f622bdb1..746585675 100644 --- a/plugins/native_dio_adapter/lib/native_dio_adapter.dart +++ b/plugins/native_dio_adapter/lib/native_dio_adapter.dart @@ -3,6 +3,5 @@ library native_dio_adapter; export 'src/native_adapter.dart'; export 'src/cronet_adapter.dart'; export 'src/cupertino_adapter.dart'; -export 'package:cupertino_http/cupertino_client.dart'; export 'package:cupertino_http/cupertino_http.dart'; -export 'package:cronet_http/cronet_client.dart'; +export 'package:cronet_http/cronet_http.dart'; diff --git a/plugins/native_dio_adapter/lib/src/cronet_adapter.dart b/plugins/native_dio_adapter/lib/src/cronet_adapter.dart index bf41f716d..656f2bb92 100644 --- a/plugins/native_dio_adapter/lib/src/cronet_adapter.dart +++ b/plugins/native_dio_adapter/lib/src/cronet_adapter.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; -import 'package:cronet_http/cronet_client.dart'; +import 'package:cronet_http/cronet_http.dart'; import 'package:dio/dio.dart'; import 'conversion_layer_adapter.dart'; @@ -9,7 +9,9 @@ import 'conversion_layer_adapter.dart'; /// [cronet_http](https://pub.dev/packages/cronet_http). class CronetAdapter implements HttpClientAdapter { CronetAdapter(CronetEngine? engine) - : _conversionLayer = ConversionLayerAdapter(CronetClient(engine)); + : _conversionLayer = ConversionLayerAdapter(engine == null + ? CronetClient.defaultCronetEngine() + : CronetClient.fromCronetEngine(engine)); final ConversionLayerAdapter _conversionLayer; diff --git a/plugins/native_dio_adapter/lib/src/cupertino_adapter.dart b/plugins/native_dio_adapter/lib/src/cupertino_adapter.dart index a72114967..800f2493e 100644 --- a/plugins/native_dio_adapter/lib/src/cupertino_adapter.dart +++ b/plugins/native_dio_adapter/lib/src/cupertino_adapter.dart @@ -1,6 +1,5 @@ import 'dart:typed_data'; -import 'package:cupertino_http/cupertino_client.dart'; import 'package:cupertino_http/cupertino_http.dart'; import 'package:dio/dio.dart'; import 'conversion_layer_adapter.dart'; diff --git a/plugins/native_dio_adapter/lib/src/native_adapter.dart b/plugins/native_dio_adapter/lib/src/native_adapter.dart index a768ce01f..bd25f30e1 100644 --- a/plugins/native_dio_adapter/lib/src/native_adapter.dart +++ b/plugins/native_dio_adapter/lib/src/native_adapter.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'dart:typed_data'; -import 'package:cronet_http/cronet_client.dart'; +import 'package:cronet_http/cronet_http.dart'; import 'package:cupertino_http/cupertino_http.dart'; import 'package:dio/dio.dart'; import 'cronet_adapter.dart'; diff --git a/plugins/native_dio_adapter/pubspec.yaml b/plugins/native_dio_adapter/pubspec.yaml index 819a0dc46..80c140288 100644 --- a/plugins/native_dio_adapter/pubspec.yaml +++ b/plugins/native_dio_adapter/pubspec.yaml @@ -6,13 +6,13 @@ repository: https://github.com/cfug/dio/blob/main/plugins/native_dio_adapter issue_tracker: https://github.com/cfug/dio/issues environment: - sdk: '>=2.18.0 <3.0.0' - flutter: ">=3.0.0" + sdk: '>=2.19.0 <3.0.0' + flutter: ">=3.7.0" dependencies: dio: ^5.0.0 - cupertino_http: ^0.0.9 - cronet_http: ^0.0.3 + cupertino_http: ^0.1.2 + cronet_http: ^0.2.0 http: ^0.13.4 dev_dependencies: