diff --git a/.github/workflows/dio.yml b/.github/workflows/dio.yml index 991e0206c..7eb9c637c 100644 --- a/.github/workflows/dio.yml +++ b/.github/workflows/dio.yml @@ -1,14 +1,12 @@ -name: Dio +name: diox on: push: branches: - main - - develop* pull_request: branches: - main - - develop* jobs: analyze: diff --git a/.github/workflows/example-app.yml b/.github/workflows/example-app.yml index fda3ffcf2..4dcab3357 100644 --- a/.github/workflows/example-app.yml +++ b/.github/workflows/example-app.yml @@ -4,11 +4,9 @@ on: push: branches: - main - - develop* pull_request: branches: - main - - develop* jobs: analyze: diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml index 99528c5c9..d614ee22f 100644 --- a/.github/workflows/example.yml +++ b/.github/workflows/example.yml @@ -4,11 +4,9 @@ on: push: branches: - main - - develop* pull_request: branches: - main - - develop* jobs: analyze: diff --git a/.github/workflows/plugin_cookie_manager.yml b/.github/workflows/plugin_cookie_manager.yml index 43e440492..f8f3acda2 100644 --- a/.github/workflows/plugin_cookie_manager.yml +++ b/.github/workflows/plugin_cookie_manager.yml @@ -4,11 +4,9 @@ on: push: branches: - main - - develop* pull_request: branches: - main - - develop* jobs: analyze: @@ -61,3 +59,17 @@ jobs: with: name: test-results-${{ matrix.sdk }} path: plugins/cookie_manager/build/reports/test-results.json + + publish-dry-run: + name: Publish dry-run + runs-on: ubuntu-latest + defaults: + run: + working-directory: plugins/cookie_manager + steps: + - uses: actions/checkout@v3 + - uses: dart-lang/setup-dart@v1 + with: + sdk: stable + - run: dart pub get + - run: dart pub publish --dry-run diff --git a/.github/workflows/plugin_http2_adapter.yml b/.github/workflows/plugin_http2_adapter.yml index 08c765f5f..2f94a14d6 100644 --- a/.github/workflows/plugin_http2_adapter.yml +++ b/.github/workflows/plugin_http2_adapter.yml @@ -4,11 +4,9 @@ on: push: branches: - main - - develop* pull_request: branches: - main - - develop* jobs: analyze: @@ -55,3 +53,17 @@ jobs: ./scripts/prepare_pinning_certs.sh - run: cd plugins/http2_adapter && dart pub get - run: cd plugins/http2_adapter && dart test --chain-stack-traces + + publish-dry-run: + name: Publish dry-run + runs-on: ubuntu-latest + defaults: + run: + working-directory: plugins/http2_adapter + steps: + - uses: actions/checkout@v3 + - uses: dart-lang/setup-dart@v1 + with: + sdk: stable + - run: dart pub get + - run: dart pub publish --dry-run diff --git a/dio/README-ZH.md b/dio/README-ZH.md index d83a67e0f..f04730b84 100644 --- a/dio/README-ZH.md +++ b/dio/README-ZH.md @@ -74,7 +74,7 @@ dependency_overrides: ## 一个极简的示例 ```dart -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; final dio = Dio(); @@ -112,7 +112,7 @@ void getHttp() async { 发起一个 `GET` 请求 : ```dart -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; final dio = Dio(); @@ -409,7 +409,7 @@ dio.interceptors.add( 一个简单的自定义拦截器示例: ```dart -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; class CustomInterceptors extends Interceptor { @override void onRequest(RequestOptions options, RequestInterceptorHandler handler) { @@ -783,7 +783,7 @@ token.cancel('cancelled'); 但是可以继承 `DioForNative` 或 `DioForBrowser`: ```dart -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:diox/io.dart'; // 在浏览器中,导入 'package:diox/browser.dart'。 diff --git a/dio/README.md b/dio/README.md index deb698d74..e600bc1e9 100644 --- a/dio/README.md +++ b/dio/README.md @@ -78,7 +78,7 @@ dependency_overrides: ### Super simple to use ```dart -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; final dio = Dio(); @@ -116,7 +116,7 @@ in [here](https://github.com/flutterchina/dio/issues/347). Performing a `GET` request: ```dart -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; final dio = Dio(); @@ -436,7 +436,7 @@ dio.interceptors.add( Simple interceptor example: ```dart -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; class CustomInterceptors extends Interceptor { @override void onRequest(RequestOptions options, RequestInterceptorHandler handler) { @@ -829,7 +829,7 @@ so we don't extend `Dio` class direct. We can extend `DioForNative` or `DioForBrowser` instead, for example: ```dart -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:diox/io.dart'; // If in browser, import 'package:diox/browser.dart'. diff --git a/dio/example/dio.dart b/dio/example/dio.dart index de27ad4c9..a81ed2995 100644 --- a/dio/example/dio.dart +++ b/dio/example/dio.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; /// More examples see https://github.com/cfug/diox/blob/main/example void main() async { diff --git a/dio/lib/dio.dart b/dio/lib/diox.dart similarity index 97% rename from dio/lib/dio.dart rename to dio/lib/diox.dart index 8f9d977cc..659186888 100644 --- a/dio/lib/dio.dart +++ b/dio/lib/diox.dart @@ -1,7 +1,7 @@ /// A powerful Http client for Dart, which supports Interceptors, /// Global configuration, FormData, File downloading etc. and Dio is /// very easy to use. -library dio; +library diox; export 'src/adapter.dart'; export 'src/cancel_token.dart'; diff --git a/dio/lib/src/parameter.dart b/dio/lib/src/parameter.dart index 8d02eb452..b7d645311 100644 --- a/dio/lib/src/parameter.dart +++ b/dio/lib/src/parameter.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; class ListParam { final ListFormat format; diff --git a/dio/lib/src/progress_stream/browser_progress_stream.dart b/dio/lib/src/progress_stream/browser_progress_stream.dart index f95a15562..0c6fdacc2 100644 --- a/dio/lib/src/progress_stream/browser_progress_stream.dart +++ b/dio/lib/src/progress_stream/browser_progress_stream.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:typed_data'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; Stream addProgress( Stream> stream, diff --git a/dio/lib/src/progress_stream/io_progress_stream.dart b/dio/lib/src/progress_stream/io_progress_stream.dart index aa518f0a0..60e354575 100644 --- a/dio/lib/src/progress_stream/io_progress_stream.dart +++ b/dio/lib/src/progress_stream/io_progress_stream.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:typed_data'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; Stream addProgress( Stream> stream, diff --git a/dio/test/basic_test.dart b/dio/test/basic_test.dart index 9578ff935..5bfee09ae 100644 --- a/dio/test/basic_test.dart +++ b/dio/test/basic_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:test/test.dart'; void main() { diff --git a/dio/test/dio_mixin_test.dart b/dio/test/dio_mixin_test.dart index eef488257..c1eaee9a3 100644 --- a/dio/test/dio_mixin_test.dart +++ b/dio/test/dio_mixin_test.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:test/test.dart'; void main() { diff --git a/dio/test/download_test.dart b/dio/test/download_test.dart index 2964597a0..e43b2e037 100644 --- a/dio/test/download_test.dart +++ b/dio/test/download_test.dart @@ -1,7 +1,7 @@ @TestOn('vm') import 'dart:io'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:test/test.dart'; import 'mock/adapters.dart'; diff --git a/dio/test/encoding_test.dart b/dio/test/encoding_test.dart index ab181ddab..678c8d054 100644 --- a/dio/test/encoding_test.dart +++ b/dio/test/encoding_test.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:test/test.dart'; void main() { diff --git a/dio/test/exception_test.dart b/dio/test/exception_test.dart index cf5b19ba7..514f416a1 100644 --- a/dio/test/exception_test.dart +++ b/dio/test/exception_test.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:diox/io.dart'; import 'package:test/test.dart'; diff --git a/dio/test/formdata_test.dart b/dio/test/formdata_test.dart index aa8403501..c6e0638ce 100644 --- a/dio/test/formdata_test.dart +++ b/dio/test/formdata_test.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:test/test.dart'; void main() async { diff --git a/dio/test/interceptor_test.dart b/dio/test/interceptor_test.dart index f26a33c17..5f4c8cbad 100644 --- a/dio/test/interceptor_test.dart +++ b/dio/test/interceptor_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:test/test.dart'; import 'mock/adapters.dart'; diff --git a/dio/test/mimetype_test.dart b/dio/test/mimetype_test.dart index ca4154dbd..b0de5d7f8 100644 --- a/dio/test/mimetype_test.dart +++ b/dio/test/mimetype_test.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:test/test.dart'; void main() { diff --git a/dio/test/mock/adapters.dart b/dio/test/mock/adapters.dart index f03452833..a60f8a6f1 100644 --- a/dio/test/mock/adapters.dart +++ b/dio/test/mock/adapters.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'dart:io'; import 'dart:typed_data'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:diox/io.dart'; class MockAdapter implements HttpClientAdapter { diff --git a/dio/test/options_test.dart b/dio/test/options_test.dart index f8084549a..e5fc7d1a4 100644 --- a/dio/test/options_test.dart +++ b/dio/test/options_test.dart @@ -1,7 +1,7 @@ @TestOn('vm') import 'dart:convert'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:test/test.dart'; import 'mock/adapters.dart'; diff --git a/dio/test/pinning_test.dart b/dio/test/pinning_test.dart index d06be45ef..aca92ece6 100644 --- a/dio/test/pinning_test.dart +++ b/dio/test/pinning_test.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:crypto/crypto.dart'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:diox/io.dart'; import 'package:test/test.dart'; diff --git a/dio/test/readtimeout_test.dart b/dio/test/readtimeout_test.dart index aa16eb2db..5119820ce 100644 --- a/dio/test/readtimeout_test.dart +++ b/dio/test/readtimeout_test.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:diox/io.dart'; import 'package:test/test.dart'; diff --git a/dio/test/request_test.dart b/dio/test/request_test.dart index 115da42d0..891416602 100644 --- a/dio/test/request_test.dart +++ b/dio/test/request_test.dart @@ -1,7 +1,7 @@ @TestOn('vm') import 'dart:convert'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:test/test.dart'; import 'utils.dart'; diff --git a/dio/test/upload_stream_test.dart b/dio/test/upload_stream_test.dart index 347c8294b..fde1ca0ff 100644 --- a/dio/test/upload_stream_test.dart +++ b/dio/test/upload_stream_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:test/test.dart'; void main() { diff --git a/example/lib/adapter.dart b/example/lib/adapter.dart index e5c34149b..98c5bde36 100644 --- a/example/lib/adapter.dart +++ b/example/lib/adapter.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:typed_data'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; class MyAdapter implements HttpClientAdapter { final HttpClientAdapter _adapter = HttpClientAdapter(); diff --git a/example/lib/cancel_request.dart b/example/lib/cancel_request.dart index a7462f7e8..bade8a724 100644 --- a/example/lib/cancel_request.dart +++ b/example/lib/cancel_request.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; void main() async { final dio = Dio(); diff --git a/example/lib/certificate_pinning.dart b/example/lib/certificate_pinning.dart index 95106956b..fce07fc06 100644 --- a/example/lib/certificate_pinning.dart +++ b/example/lib/certificate_pinning.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:crypto/crypto.dart'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:diox/io.dart'; void main() async { diff --git a/example/lib/cookie_mgr.dart b/example/lib/cookie_mgr.dart index 560fc43db..e7a21c241 100644 --- a/example/lib/cookie_mgr.dart +++ b/example/lib/cookie_mgr.dart @@ -1,6 +1,6 @@ import 'package:cookie_jar/cookie_jar.dart'; -import 'package:diox/dio.dart'; -import 'package:diox_cookie_manager/dio_cookie_manager.dart'; +import 'package:diox/diox.dart'; +import 'package:diox_cookie_manager/diox_cookie_manager.dart'; void main() async { final dio = Dio(); diff --git a/example/lib/custom_cache_interceptor.dart b/example/lib/custom_cache_interceptor.dart index 1e0813999..a8286239c 100644 --- a/example/lib/custom_cache_interceptor.dart +++ b/example/lib/custom_cache_interceptor.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; class CacheInterceptor extends Interceptor { CacheInterceptor(); diff --git a/example/lib/dio.dart b/example/lib/dio.dart index 3f0274f68..2c691af0f 100644 --- a/example/lib/dio.dart +++ b/example/lib/dio.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; void main() async { final dio = Dio(); diff --git a/example/lib/download.dart b/example/lib/download.dart index 38bddc97c..8f79fd884 100644 --- a/example/lib/download.dart +++ b/example/lib/download.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; // In this example we download a image and listen the downloading progress. void main() async { diff --git a/example/lib/download_with_trunks.dart b/example/lib/download_with_trunks.dart index 3f6c84bf7..16681b518 100644 --- a/example/lib/download_with_trunks.dart +++ b/example/lib/download_with_trunks.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; void main() async { final url = 'http://download.dcloud.net.cn/HBuilder.9.0.2.macosx_64.dmg'; diff --git a/example/lib/extend_dio.dart b/example/lib/extend_dio.dart index 9c2f807e8..92ca6749c 100644 --- a/example/lib/extend_dio.dart +++ b/example/lib/extend_dio.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:diox/io.dart'; class HttpService extends DioForNative { diff --git a/example/lib/formdata.dart b/example/lib/formdata.dart index 7f9800906..3c55eaacb 100644 --- a/example/lib/formdata.dart +++ b/example/lib/formdata.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:diox/io.dart'; void showProgress(received, total) { diff --git a/example/lib/generic.dart b/example/lib/generic.dart index 1177018ca..67e0a7cb0 100644 --- a/example/lib/generic.dart +++ b/example/lib/generic.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; void main() async { final dio = Dio( diff --git a/example/lib/http2_adapter.dart b/example/lib/http2_adapter.dart index 305766c42..5cbbef22e 100644 --- a/example/lib/http2_adapter.dart +++ b/example/lib/http2_adapter.dart @@ -1,5 +1,5 @@ -import 'package:diox/dio.dart'; -import 'package:diox_http2_adapter/dio_http2_adapter.dart'; +import 'package:diox/diox.dart'; +import 'package:diox_http2_adapter/diox_http2_adapter.dart'; void main() async { final dio = Dio() diff --git a/example/lib/options.dart b/example/lib/options.dart index bccb986e9..fb7f862ac 100644 --- a/example/lib/options.dart +++ b/example/lib/options.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; void main() async { final dio = Dio(BaseOptions( diff --git a/example/lib/post_stream_and_bytes.dart b/example/lib/post_stream_and_bytes.dart index d8eea58f4..bb26e083d 100644 --- a/example/lib/post_stream_and_bytes.dart +++ b/example/lib/post_stream_and_bytes.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; void main() async { final dio = Dio(BaseOptions( diff --git a/example/lib/proxy.dart b/example/lib/proxy.dart index b3b4cf85b..4a13c24b3 100644 --- a/example/lib/proxy.dart +++ b/example/lib/proxy.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:diox/io.dart'; void main() async { diff --git a/example/lib/queue_interceptors.dart b/example/lib/queue_interceptors.dart index 7075c80ab..a5d3953f5 100644 --- a/example/lib/queue_interceptors.dart +++ b/example/lib/queue_interceptors.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; void main() async { final dio = Dio(); diff --git a/example/lib/queued_interceptor_crsftoken.dart b/example/lib/queued_interceptor_crsftoken.dart index 5d9d4d42f..7f51bb579 100644 --- a/example/lib/queued_interceptor_crsftoken.dart +++ b/example/lib/queued_interceptor_crsftoken.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:convert'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; void main() async { final dio = Dio(); diff --git a/example/lib/request_interceptors.dart b/example/lib/request_interceptors.dart index 1842bcabe..882ccd25c 100644 --- a/example/lib/request_interceptors.dart +++ b/example/lib/request_interceptors.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; void main() async { final dio = Dio(); diff --git a/example/lib/response_interceptor.dart b/example/lib/response_interceptor.dart index b7ec8ef59..471f4dbdd 100644 --- a/example/lib/response_interceptor.dart +++ b/example/lib/response_interceptor.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; void main() async { const urlNotFound = 'https://wendux.github.io/xxxxx/'; diff --git a/example/lib/test.dart b/example/lib/test.dart index 5345700d0..c9aa2f93f 100644 --- a/example/lib/test.dart +++ b/example/lib/test.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; // void getHttp() async { // final dio = Dio(); diff --git a/example/lib/transformer.dart b/example/lib/transformer.dart index 9eae2b842..f8d553e1d 100644 --- a/example/lib/transformer.dart +++ b/example/lib/transformer.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; /// If the request data is a `List` type, the [DefaultTransformer] will send data /// by calling its `toString()` method. However, normally the List object is diff --git a/example_flutter_app/lib/http.dart b/example_flutter_app/lib/http.dart index edeedd567..4b47260ae 100644 --- a/example_flutter_app/lib/http.dart +++ b/example_flutter_app/lib/http.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; final dio = Dio(BaseOptions( connectTimeout: Duration(seconds: 3), diff --git a/example_flutter_app/lib/main.dart b/example_flutter_app/lib/main.dart index 244d64220..8fee3afab 100644 --- a/example_flutter_app/lib/main.dart +++ b/example_flutter_app/lib/main.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/example_flutter_app/lib/routes/request.dart b/example_flutter_app/lib/routes/request.dart index d23c652f2..8779e22ea 100644 --- a/example_flutter_app/lib/routes/request.dart +++ b/example_flutter_app/lib/routes/request.dart @@ -1,4 +1,4 @@ -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:flutter/material.dart'; import '../http.dart'; diff --git a/plugins/cookie_manager/CHANGELOG.md b/plugins/cookie_manager/CHANGELOG.md index e9e878284..6c3bf94ad 100644 --- a/plugins/cookie_manager/CHANGELOG.md +++ b/plugins/cookie_manager/CHANGELOG.md @@ -1,16 +1,21 @@ +# CHANGELOG -## [2.0.0] +## 2.1.0-dev.1 + +* Prepare for the `diox`'s release. + +## 2.0.0 * support dio 4.0.0 -## [2.0.0-beta1] +## 2.0.0-beta1 * support nullsafety -## [1.0.0] - 2019.9.18 +## 1.0.0 - 2019.9.18 * First stable version -## [0.0.1] - 2019.9.17 +## 0.0.1 - 2019.9.17 * A cookie manager for Dio. diff --git a/plugins/cookie_manager/README.md b/plugins/cookie_manager/README.md index 2eee9af43..eea70e7cf 100644 --- a/plugins/cookie_manager/README.md +++ b/plugins/cookie_manager/README.md @@ -17,8 +17,8 @@ dependencies: ```dart import 'package:cookie_jar/cookie_jar.dart'; -import 'package:diox/dio.dart'; -import 'package:diox_cookie_manager/dio_cookie_manager.dart'; +import 'package:diox/diox.dart'; +import 'package:diox_cookie_manager/diox_cookie_manager.dart'; void main() async { final dio = Dio(); diff --git a/plugins/cookie_manager/example/example.dart b/plugins/cookie_manager/example/example.dart index bf17a1ec8..addd0ccdb 100644 --- a/plugins/cookie_manager/example/example.dart +++ b/plugins/cookie_manager/example/example.dart @@ -1,6 +1,6 @@ import 'package:cookie_jar/cookie_jar.dart'; -import 'package:diox/dio.dart'; -import 'package:diox_cookie_manager/dio_cookie_manager.dart'; +import 'package:diox/diox.dart'; +import 'package:diox_cookie_manager/diox_cookie_manager.dart'; void main() async { final dio = Dio(); diff --git a/plugins/cookie_manager/lib/dio_cookie_manager.dart b/plugins/cookie_manager/lib/diox_cookie_manager.dart similarity index 51% rename from plugins/cookie_manager/lib/dio_cookie_manager.dart rename to plugins/cookie_manager/lib/diox_cookie_manager.dart index cf67dcae0..907cbe63b 100644 --- a/plugins/cookie_manager/lib/dio_cookie_manager.dart +++ b/plugins/cookie_manager/lib/diox_cookie_manager.dart @@ -1,3 +1,3 @@ -library dio_cookie_manager; +library diox_cookie_manager; export 'src/cookie_mgr.dart'; diff --git a/plugins/cookie_manager/lib/src/cookie_mgr.dart b/plugins/cookie_manager/lib/src/cookie_mgr.dart index ffb0280b0..f3bade485 100644 --- a/plugins/cookie_manager/lib/src/cookie_mgr.dart +++ b/plugins/cookie_manager/lib/src/cookie_mgr.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:io'; import 'package:cookie_jar/cookie_jar.dart'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; const _kIsWeb = bool.hasEnvironment('dart.library.js_util') ? bool.fromEnvironment('dart.library.js_util') diff --git a/plugins/cookie_manager/pubspec.yaml b/plugins/cookie_manager/pubspec.yaml index 626218278..bdbcb206e 100644 --- a/plugins/cookie_manager/pubspec.yaml +++ b/plugins/cookie_manager/pubspec.yaml @@ -1,6 +1,6 @@ name: diox_cookie_manager description: A cookie manager for Dio, which supports persistent cookies in RAM and file. -version: 2.0.0 +version: 2.1.0-dev.1 homepage: https://github.com/cfug/diox repository: https://github.com/cfug/diox/blob/main/plugins/cookie_manager @@ -11,10 +11,10 @@ dependencies: cookie_jar: ^3.0.0 diox: ^5.0.0-dev.1 -dependency_overrides: - diox: - path: ../../dio - dev_dependencies: - lints: ^1.0.1 + lints: any test: ^1.16.4 + +#dependency_overrides: +# diox: +# path: ../../dio diff --git a/plugins/cookie_manager/test/basic_test.dart b/plugins/cookie_manager/test/basic_test.dart index 1dddf248b..24d12c259 100644 --- a/plugins/cookie_manager/test/basic_test.dart +++ b/plugins/cookie_manager/test/basic_test.dart @@ -1,6 +1,6 @@ import 'package:cookie_jar/cookie_jar.dart'; -import 'package:diox/dio.dart'; -import 'package:diox_cookie_manager/dio_cookie_manager.dart'; +import 'package:diox/diox.dart'; +import 'package:diox_cookie_manager/diox_cookie_manager.dart'; import 'package:test/test.dart'; void main() { diff --git a/plugins/http2_adapter/CHANGELOG.md b/plugins/http2_adapter/CHANGELOG.md index 0a9b5cf3f..463f82024 100644 --- a/plugins/http2_adapter/CHANGELOG.md +++ b/plugins/http2_adapter/CHANGELOG.md @@ -1,5 +1,8 @@ -## NEXT +# CHANGELOG +## 2.1.0-dev.1 + +* Prepare for the `diox`'s release. * Add `validateCertificate` for `ClientSetting`. ## [2.0.0] diff --git a/plugins/http2_adapter/README.md b/plugins/http2_adapter/README.md index a6d738bc5..7b700dfbb 100644 --- a/plugins/http2_adapter/README.md +++ b/plugins/http2_adapter/README.md @@ -16,8 +16,8 @@ dependencies: ### Usage ```dart -import 'package:diox/dio.dart'; -import 'package:diox_http2_adapter/dio_http2_adapter.dart'; +import 'package:diox/diox.dart'; +import 'package:diox_http2_adapter/diox_http2_adapter.dart'; void main() async { final dio = Dio() diff --git a/plugins/http2_adapter/example/example.dart b/plugins/http2_adapter/example/example.dart index b5ddd1c6c..e6d7393fe 100644 --- a/plugins/http2_adapter/example/example.dart +++ b/plugins/http2_adapter/example/example.dart @@ -1,5 +1,5 @@ -import 'package:diox/dio.dart'; -import 'package:diox_http2_adapter/dio_http2_adapter.dart'; +import 'package:diox/diox.dart'; +import 'package:diox_http2_adapter/diox_http2_adapter.dart'; void main() async { final dio = Dio() diff --git a/plugins/http2_adapter/lib/dio_http2_adapter.dart b/plugins/http2_adapter/lib/diox_http2_adapter.dart similarity index 54% rename from plugins/http2_adapter/lib/dio_http2_adapter.dart rename to plugins/http2_adapter/lib/diox_http2_adapter.dart index 53c961277..8bbe05685 100644 --- a/plugins/http2_adapter/lib/dio_http2_adapter.dart +++ b/plugins/http2_adapter/lib/diox_http2_adapter.dart @@ -1,3 +1,3 @@ -library dio_http2_adapter; +library diox_http2_adapter; export 'src/http2_adapter.dart'; diff --git a/plugins/http2_adapter/lib/src/http2_adapter.dart b/plugins/http2_adapter/lib/src/http2_adapter.dart index 6558f4683..ef8ea1a2c 100644 --- a/plugins/http2_adapter/lib/src/http2_adapter.dart +++ b/plugins/http2_adapter/lib/src/http2_adapter.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'dart:io'; import 'dart:typed_data'; -import 'package:diox/dio.dart'; +import 'package:diox/diox.dart'; import 'package:http2/http2.dart'; part 'client_setting.dart'; diff --git a/plugins/http2_adapter/pubspec.yaml b/plugins/http2_adapter/pubspec.yaml index d9bf97d0d..ce27cae0e 100644 --- a/plugins/http2_adapter/pubspec.yaml +++ b/plugins/http2_adapter/pubspec.yaml @@ -1,6 +1,6 @@ name: diox_http2_adapter description: A Dio HttpClientAdapter which support Http/2.0(Support connection reuse, header compression, server pushing is not supported yet.) -version: 2.0.0 +version: 2.1.0-dev.1 homepage: https://github.com/cfug/diox repository: https://github.com/cfug/diox/blob/main/plugins/http2_adapter @@ -11,10 +11,11 @@ dependencies: http2: ^2.0.0 diox: ^5.0.0-dev.1 -dependency_overrides: - diox: - path: ../../dio - dev_dependencies: - lints: ^1.0.1 + crypto: ^3.0.2 + lints: any test: ^1.16.4 + +#dependency_overrides: +# diox: +# path: ../../dio diff --git a/plugins/http2_adapter/test/http2_test.dart b/plugins/http2_adapter/test/http2_test.dart index 2cf670875..66dd6a4ca 100644 --- a/plugins/http2_adapter/test/http2_test.dart +++ b/plugins/http2_adapter/test/http2_test.dart @@ -1,8 +1,8 @@ import 'dart:io'; import 'package:crypto/crypto.dart'; -import 'package:diox/dio.dart'; -import 'package:diox_http2_adapter/dio_http2_adapter.dart'; +import 'package:diox/diox.dart'; +import 'package:diox_http2_adapter/diox_http2_adapter.dart'; import 'package:test/test.dart'; void main() {