From 5d748e336b4ec374e6981b0424618f14b24b0b1a Mon Sep 17 00:00:00 2001 From: Martin Kamleithner Date: Sun, 12 Mar 2023 21:17:29 +0100 Subject: [PATCH 1/5] feat(native_dio_adapter): bump cronet_http, cupertino_http dependency --- plugins/native_dio_adapter/CHANGELOG.md | 1 + plugins/native_dio_adapter/lib/native_dio_adapter.dart | 3 +-- plugins/native_dio_adapter/lib/src/cronet_adapter.dart | 6 ++++-- plugins/native_dio_adapter/lib/src/cupertino_adapter.dart | 1 - plugins/native_dio_adapter/lib/src/native_adapter.dart | 2 +- plugins/native_dio_adapter/pubspec.yaml | 4 ++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/native_dio_adapter/CHANGELOG.md b/plugins/native_dio_adapter/CHANGELOG.md index a4b11f7a0..e9e504dca 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..7de1d2f15 100644 --- a/plugins/native_dio_adapter/pubspec.yaml +++ b/plugins/native_dio_adapter/pubspec.yaml @@ -11,8 +11,8 @@ environment: 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: From 316358b18c79d7f29b53afb5781e74fad99e77f4 Mon Sep 17 00:00:00 2001 From: Martin Kamleithner Date: Sun, 12 Mar 2023 21:46:28 +0100 Subject: [PATCH 2/5] bump minimum dart version to 2.19 for native_dio_adapter --- plugins/native_dio_adapter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/native_dio_adapter/pubspec.yaml b/plugins/native_dio_adapter/pubspec.yaml index 7de1d2f15..3e439e338 100644 --- a/plugins/native_dio_adapter/pubspec.yaml +++ b/plugins/native_dio_adapter/pubspec.yaml @@ -6,7 +6,7 @@ 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' + sdk: '>=2.19.0 <3.0.0' flutter: ">=3.0.0" dependencies: From 25f50175a9676eeb7ef0f275ffacbc93879ff471 Mon Sep 17 00:00:00 2001 From: Martin Kamleithner Date: Sun, 12 Mar 2023 21:52:35 +0100 Subject: [PATCH 3/5] bump minimum supported flutter version for flutter plugins to 3.7.0 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 1a51c2b0a370e21941dc3052ca96cdc7e9e27d84 Mon Sep 17 00:00:00 2001 From: Martin Kamleithner Date: Mon, 13 Mar 2023 00:31:18 +0100 Subject: [PATCH 4/5] bump minimum supported flutter version for native_dio_adapter to 3.7.0 --- plugins/native_dio_adapter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/native_dio_adapter/pubspec.yaml b/plugins/native_dio_adapter/pubspec.yaml index 3e439e338..80c140288 100644 --- a/plugins/native_dio_adapter/pubspec.yaml +++ b/plugins/native_dio_adapter/pubspec.yaml @@ -7,7 +7,7 @@ issue_tracker: https://github.com/cfug/dio/issues environment: sdk: '>=2.19.0 <3.0.0' - flutter: ">=3.0.0" + flutter: ">=3.7.0" dependencies: dio: ^5.0.0 From ba5eb978a93bc4cf86a20cf76bb82ac95c36736b Mon Sep 17 00:00:00 2001 From: Martin Kamleithner Date: Mon, 13 Mar 2023 09:15:34 +0100 Subject: [PATCH 5/5] Update plugins/native_dio_adapter/CHANGELOG.md Co-authored-by: Alex Li Signed-off-by: Martin Kamleithner --- plugins/native_dio_adapter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/native_dio_adapter/CHANGELOG.md b/plugins/native_dio_adapter/CHANGELOG.md index e9e504dca..f26583eeb 100644 --- a/plugins/native_dio_adapter/CHANGELOG.md +++ b/plugins/native_dio_adapter/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased -- Bump cupertino_http and cronet_http versions +- Bump cupertino_http and cronet_http versions. - Improve code formats according to linter rules. ## 0.0.1