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

feat(native_dio_adapter): bump cronet_http, cupertino_http dependency #1735

Merged
merged 5 commits into from
Mar 13, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions plugins/native_dio_adapter/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- Bump cupertino_http and cronet_http versions.
- Improve code formats according to linter rules.

## 0.0.1
Expand Down
3 changes: 1 addition & 2 deletions plugins/native_dio_adapter/lib/native_dio_adapter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
6 changes: 4 additions & 2 deletions plugins/native_dio_adapter/lib/src/cronet_adapter.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion plugins/native_dio_adapter/lib/src/native_adapter.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
8 changes: 4 additions & 4 deletions plugins/native_dio_adapter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down