From a00ee9a5d6a2ca78907ad496f9d8642073816ed5 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Fri, 8 Sep 2023 14:29:16 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20Melos=20(#1898)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolve #1645. ### New Pull Request Checklist - [x] I have read the [Documentation](https://pub.dev/documentation/dio/latest/) - [x] I have searched for a similar pull request in the [project](https://github.com/cfug/dio/pulls) and found none - [x] I have updated this branch with the latest `main` branch to avoid conflicts (via merge from master or rebase) - [ ] I have added the required tests to prove the fix/feature I'm adding - [ ] I have updated the documentation (if necessary) - [x] I have run the tests without failures - [ ] I have updated the `CHANGELOG.md` in the corresponding package --- .idea/modules.xml | 10 ++++----- dio/.gitignore | 1 - dio/melos_dio.iml | 16 ++++++++++++++ example/pubspec_overrides.yaml | 7 ------- example_flutter_app/pubspec_overrides.yaml | 7 ------- melos.yaml | 9 ++++++++ melos_dio.iml | 21 +++++++++++++++++++ plugins/cookie_manager/.gitignore | 2 +- .../melos_dio_cookie_manager.iml | 16 ++++++++++++++ plugins/cookie_manager/pubspec_overrides.yaml | 3 --- plugins/http2_adapter/.gitignore | 2 +- .../http2_adapter/melos_dio_http2_adapter.iml | 16 ++++++++++++++ plugins/http2_adapter/pubspec_overrides.yaml | 3 --- plugins/native_dio_adapter/.gitignore | 2 +- .../melos_native_dio_adapter.iml | 19 +++++++++++++++++ .../native_dio_adapter/pubspec_overrides.yaml | 3 --- pubspec.yaml | 10 +++++++++ 17 files changed, 115 insertions(+), 32 deletions(-) create mode 100644 dio/melos_dio.iml delete mode 100644 example/pubspec_overrides.yaml delete mode 100644 example_flutter_app/pubspec_overrides.yaml create mode 100644 melos.yaml create mode 100644 melos_dio.iml create mode 100644 plugins/cookie_manager/melos_dio_cookie_manager.iml delete mode 100644 plugins/cookie_manager/pubspec_overrides.yaml create mode 100644 plugins/http2_adapter/melos_dio_http2_adapter.iml delete mode 100644 plugins/http2_adapter/pubspec_overrides.yaml create mode 100644 plugins/native_dio_adapter/melos_native_dio_adapter.iml delete mode 100644 plugins/native_dio_adapter/pubspec_overrides.yaml create mode 100644 pubspec.yaml diff --git a/.idea/modules.xml b/.idea/modules.xml index 04267625c..dc369a6e8 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,11 +2,11 @@ - - - - - + + + + + \ No newline at end of file diff --git a/dio/.gitignore b/dio/.gitignore index f02904351..cd69fa7c9 100644 --- a/dio/.gitignore +++ b/dio/.gitignore @@ -10,7 +10,6 @@ .svn/ # IntelliJ related -*.iml *.ipr *.iws .idea/ diff --git a/dio/melos_dio.iml b/dio/melos_dio.iml new file mode 100644 index 000000000..389d07a14 --- /dev/null +++ b/dio/melos_dio.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/example/pubspec_overrides.yaml b/example/pubspec_overrides.yaml deleted file mode 100644 index 0cfe9e83e..000000000 --- a/example/pubspec_overrides.yaml +++ /dev/null @@ -1,7 +0,0 @@ -dependency_overrides: - dio: - path: ../dio - dio_cookie_manager: - path: ../plugins/cookie_manager - dio_http2_adapter: - path: ../plugins/http2_adapter diff --git a/example_flutter_app/pubspec_overrides.yaml b/example_flutter_app/pubspec_overrides.yaml deleted file mode 100644 index 0cfe9e83e..000000000 --- a/example_flutter_app/pubspec_overrides.yaml +++ /dev/null @@ -1,7 +0,0 @@ -dependency_overrides: - dio: - path: ../dio - dio_cookie_manager: - path: ../plugins/cookie_manager - dio_http2_adapter: - path: ../plugins/http2_adapter diff --git a/melos.yaml b/melos.yaml new file mode 100644 index 000000000..853a62664 --- /dev/null +++ b/melos.yaml @@ -0,0 +1,9 @@ +name: dio +repository: https://github.com/cfug/dio + +packages: + - dio + - plugins/* + +ide: + intellij: true diff --git a/melos_dio.iml b/melos_dio.iml new file mode 100644 index 000000000..c01170bea --- /dev/null +++ b/melos_dio.iml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/cookie_manager/.gitignore b/plugins/cookie_manager/.gitignore index 3132dc5ff..64b15762b 100644 --- a/plugins/cookie_manager/.gitignore +++ b/plugins/cookie_manager/.gitignore @@ -10,7 +10,6 @@ .svn/ # IntelliJ related -*.iml *.ipr *.iws .idea/ @@ -28,6 +27,7 @@ .pub-cache/ .pub/ build/ +pubspec_overrides.yaml # Android related **/android/**/gradle-wrapper.jar diff --git a/plugins/cookie_manager/melos_dio_cookie_manager.iml b/plugins/cookie_manager/melos_dio_cookie_manager.iml new file mode 100644 index 000000000..389d07a14 --- /dev/null +++ b/plugins/cookie_manager/melos_dio_cookie_manager.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/cookie_manager/pubspec_overrides.yaml b/plugins/cookie_manager/pubspec_overrides.yaml deleted file mode 100644 index cb67bae5a..000000000 --- a/plugins/cookie_manager/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - dio: - path: ../../dio diff --git a/plugins/http2_adapter/.gitignore b/plugins/http2_adapter/.gitignore index ba7b8e404..dc5a5faad 100644 --- a/plugins/http2_adapter/.gitignore +++ b/plugins/http2_adapter/.gitignore @@ -10,7 +10,6 @@ .svn/ # IntelliJ related -*.iml *.ipr *.iws .idea/ @@ -28,6 +27,7 @@ .pub-cache/ .pub/ build/ +pubspec_overrides.yaml # Android related **/android/**/gradle-wrapper.jar diff --git a/plugins/http2_adapter/melos_dio_http2_adapter.iml b/plugins/http2_adapter/melos_dio_http2_adapter.iml new file mode 100644 index 000000000..389d07a14 --- /dev/null +++ b/plugins/http2_adapter/melos_dio_http2_adapter.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/http2_adapter/pubspec_overrides.yaml b/plugins/http2_adapter/pubspec_overrides.yaml deleted file mode 100644 index cb67bae5a..000000000 --- a/plugins/http2_adapter/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - dio: - path: ../../dio diff --git a/plugins/native_dio_adapter/.gitignore b/plugins/native_dio_adapter/.gitignore index abd4c5d5c..8d1fae670 100644 --- a/plugins/native_dio_adapter/.gitignore +++ b/plugins/native_dio_adapter/.gitignore @@ -3,7 +3,6 @@ .packages # IntelliJ related -*.iml *.ipr *.iws .idea/ @@ -15,3 +14,4 @@ build/ # https://dart.dev/guides/libraries/private-files#pubspeclock. pubspec.lock .DS_Store +/pubspec_overrides.yaml diff --git a/plugins/native_dio_adapter/melos_native_dio_adapter.iml b/plugins/native_dio_adapter/melos_native_dio_adapter.iml new file mode 100644 index 000000000..bd8b0461d --- /dev/null +++ b/plugins/native_dio_adapter/melos_native_dio_adapter.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/native_dio_adapter/pubspec_overrides.yaml b/plugins/native_dio_adapter/pubspec_overrides.yaml deleted file mode 100644 index cb67bae5a..000000000 --- a/plugins/native_dio_adapter/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - dio: - path: ../../dio diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 000000000..a7e72fd53 --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,10 @@ +name: dio_workspace +publish_to: 'none' +repository: https://github.com/cfug/dio + +environment: + sdk: '>=2.16.0 <4.0.0' + +dev_dependencies: + lints: any + melos: ^3.1.0