From 8cac2711d6fc45c63557723142d3ce08849bb6bd Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Thu, 28 Jul 2022 19:51:33 +0200 Subject: [PATCH] refactor: Migrate to using melos --- .gitignore | 2 ++ packages/moxdns/README.md => README.md | 8 ++++++ ...ysis_options.yaml => analysis_options.yaml | 0 .../moxdns/example => example}/.gitignore | 0 .../moxdns/example => example}/.metadata | 0 .../moxdns/example => example}/README.md | 0 .../example => example}/analysis_options.yaml | 0 .../example => example}/android/.gitignore | 0 .../android/app/build.gradle | 0 .../android/app/src/debug/AndroidManifest.xml | 0 .../android/app/src/main/AndroidManifest.xml | 0 .../me/polynom/moxdns_example/MainActivity.kt | 0 .../res/drawable-v21/launch_background.xml | 0 .../main/res/drawable/launch_background.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/values-night/styles.xml | 0 .../app/src/main/res/values/styles.xml | 0 .../app/src/profile/AndroidManifest.xml | 0 .../example => example}/android/build.gradle | 0 .../android/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.properties | 0 .../android/settings.gradle | 0 .../moxdns/example => example}/lib/main.dart | 0 .../example => example}/linux/.gitignore | 0 .../example => example}/linux/CMakeLists.txt | 0 .../linux/flutter/CMakeLists.txt | 0 .../flutter/generated_plugin_registrant.cc | 0 .../flutter/generated_plugin_registrant.h | 0 .../linux/flutter/generated_plugins.cmake | 0 .../moxdns/example => example}/linux/main.cc | 0 .../linux/my_application.cc | 0 .../linux/my_application.h | 0 .../moxdns/example => example}/pubspec.lock | 23 +++++++++--------- .../moxdns/example => example}/pubspec.yaml | 3 ++- .../example => example}/test/widget_test.dart | 0 melos.yaml | 12 +++++++++ packages/moxdns_android/analysis_options.yaml | 9 +------ packages/moxdns_linux/analysis_options.yaml | 9 +------ .../analysis_options.yaml | 9 +------ 43 files changed, 38 insertions(+), 37 deletions(-) rename packages/moxdns/README.md => README.md (66%) rename packages/moxdns/analysis_options.yaml => analysis_options.yaml (100%) rename {packages/moxdns/example => example}/.gitignore (100%) rename {packages/moxdns/example => example}/.metadata (100%) rename {packages/moxdns/example => example}/README.md (100%) rename {packages/moxdns/example => example}/analysis_options.yaml (100%) rename {packages/moxdns/example => example}/android/.gitignore (100%) rename {packages/moxdns/example => example}/android/app/build.gradle (100%) rename {packages/moxdns/example => example}/android/app/src/debug/AndroidManifest.xml (100%) rename {packages/moxdns/example => example}/android/app/src/main/AndroidManifest.xml (100%) rename {packages/moxdns/example => example}/android/app/src/main/kotlin/me/polynom/moxdns_example/MainActivity.kt (100%) rename {packages/moxdns/example => example}/android/app/src/main/res/drawable-v21/launch_background.xml (100%) rename {packages/moxdns/example => example}/android/app/src/main/res/drawable/launch_background.xml (100%) rename {packages/moxdns/example => example}/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {packages/moxdns/example => example}/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {packages/moxdns/example => example}/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {packages/moxdns/example => example}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {packages/moxdns/example => example}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {packages/moxdns/example => example}/android/app/src/main/res/values-night/styles.xml (100%) rename {packages/moxdns/example => example}/android/app/src/main/res/values/styles.xml (100%) rename {packages/moxdns/example => example}/android/app/src/profile/AndroidManifest.xml (100%) rename {packages/moxdns/example => example}/android/build.gradle (100%) rename {packages/moxdns/example => example}/android/gradle.properties (100%) rename {packages/moxdns/example => example}/android/gradle/wrapper/gradle-wrapper.properties (100%) rename {packages/moxdns/example => example}/android/settings.gradle (100%) rename {packages/moxdns/example => example}/lib/main.dart (100%) rename {packages/moxdns/example => example}/linux/.gitignore (100%) rename {packages/moxdns/example => example}/linux/CMakeLists.txt (100%) rename {packages/moxdns/example => example}/linux/flutter/CMakeLists.txt (100%) rename {packages/moxdns/example => example}/linux/flutter/generated_plugin_registrant.cc (100%) rename {packages/moxdns/example => example}/linux/flutter/generated_plugin_registrant.h (100%) rename {packages/moxdns/example => example}/linux/flutter/generated_plugins.cmake (100%) rename {packages/moxdns/example => example}/linux/main.cc (100%) rename {packages/moxdns/example => example}/linux/my_application.cc (100%) rename {packages/moxdns/example => example}/linux/my_application.h (100%) rename {packages/moxdns/example => example}/pubspec.lock (92%) rename {packages/moxdns/example => example}/pubspec.yaml (98%) rename {packages/moxdns/example => example}/test/widget_test.dart (100%) create mode 100644 melos.yaml diff --git a/.gitignore b/.gitignore index 16606be..07ae3db 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,8 @@ .dart_tool/ .packages build/ +**/pubspec_overrides.yaml +# NixOs .direnv .envrc diff --git a/packages/moxdns/README.md b/README.md similarity index 66% rename from packages/moxdns/README.md rename to README.md index 2b8e8be..3a2735b 100644 --- a/packages/moxdns/README.md +++ b/README.md @@ -20,6 +20,14 @@ essentially does nothing right now. The function will return a future that either resolves to a list of SRV records, an empty list of no records were found or `null` if an error occured. +## Contributing + +The development of this package is based on [melos](https://pub.dev/packages/melos). + +To make all packages link to each other locally, begin by running `melos bootstrap`. After editing +the code and making your changes, please run `melos run analyze` to make sure that no linter warnings +are left inside the code. + ## License See `LICENSE`. diff --git a/packages/moxdns/analysis_options.yaml b/analysis_options.yaml similarity index 100% rename from packages/moxdns/analysis_options.yaml rename to analysis_options.yaml diff --git a/packages/moxdns/example/.gitignore b/example/.gitignore similarity index 100% rename from packages/moxdns/example/.gitignore rename to example/.gitignore diff --git a/packages/moxdns/example/.metadata b/example/.metadata similarity index 100% rename from packages/moxdns/example/.metadata rename to example/.metadata diff --git a/packages/moxdns/example/README.md b/example/README.md similarity index 100% rename from packages/moxdns/example/README.md rename to example/README.md diff --git a/packages/moxdns/example/analysis_options.yaml b/example/analysis_options.yaml similarity index 100% rename from packages/moxdns/example/analysis_options.yaml rename to example/analysis_options.yaml diff --git a/packages/moxdns/example/android/.gitignore b/example/android/.gitignore similarity index 100% rename from packages/moxdns/example/android/.gitignore rename to example/android/.gitignore diff --git a/packages/moxdns/example/android/app/build.gradle b/example/android/app/build.gradle similarity index 100% rename from packages/moxdns/example/android/app/build.gradle rename to example/android/app/build.gradle diff --git a/packages/moxdns/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from packages/moxdns/example/android/app/src/debug/AndroidManifest.xml rename to example/android/app/src/debug/AndroidManifest.xml diff --git a/packages/moxdns/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml similarity index 100% rename from packages/moxdns/example/android/app/src/main/AndroidManifest.xml rename to example/android/app/src/main/AndroidManifest.xml diff --git a/packages/moxdns/example/android/app/src/main/kotlin/me/polynom/moxdns_example/MainActivity.kt b/example/android/app/src/main/kotlin/me/polynom/moxdns_example/MainActivity.kt similarity index 100% rename from packages/moxdns/example/android/app/src/main/kotlin/me/polynom/moxdns_example/MainActivity.kt rename to example/android/app/src/main/kotlin/me/polynom/moxdns_example/MainActivity.kt diff --git a/packages/moxdns/example/android/app/src/main/res/drawable-v21/launch_background.xml b/example/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from packages/moxdns/example/android/app/src/main/res/drawable-v21/launch_background.xml rename to example/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/packages/moxdns/example/android/app/src/main/res/drawable/launch_background.xml b/example/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from packages/moxdns/example/android/app/src/main/res/drawable/launch_background.xml rename to example/android/app/src/main/res/drawable/launch_background.xml diff --git a/packages/moxdns/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from packages/moxdns/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/packages/moxdns/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from packages/moxdns/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/packages/moxdns/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from packages/moxdns/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/packages/moxdns/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from packages/moxdns/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/packages/moxdns/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from packages/moxdns/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/packages/moxdns/example/android/app/src/main/res/values-night/styles.xml b/example/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from packages/moxdns/example/android/app/src/main/res/values-night/styles.xml rename to example/android/app/src/main/res/values-night/styles.xml diff --git a/packages/moxdns/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml similarity index 100% rename from packages/moxdns/example/android/app/src/main/res/values/styles.xml rename to example/android/app/src/main/res/values/styles.xml diff --git a/packages/moxdns/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from packages/moxdns/example/android/app/src/profile/AndroidManifest.xml rename to example/android/app/src/profile/AndroidManifest.xml diff --git a/packages/moxdns/example/android/build.gradle b/example/android/build.gradle similarity index 100% rename from packages/moxdns/example/android/build.gradle rename to example/android/build.gradle diff --git a/packages/moxdns/example/android/gradle.properties b/example/android/gradle.properties similarity index 100% rename from packages/moxdns/example/android/gradle.properties rename to example/android/gradle.properties diff --git a/packages/moxdns/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from packages/moxdns/example/android/gradle/wrapper/gradle-wrapper.properties rename to example/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/moxdns/example/android/settings.gradle b/example/android/settings.gradle similarity index 100% rename from packages/moxdns/example/android/settings.gradle rename to example/android/settings.gradle diff --git a/packages/moxdns/example/lib/main.dart b/example/lib/main.dart similarity index 100% rename from packages/moxdns/example/lib/main.dart rename to example/lib/main.dart diff --git a/packages/moxdns/example/linux/.gitignore b/example/linux/.gitignore similarity index 100% rename from packages/moxdns/example/linux/.gitignore rename to example/linux/.gitignore diff --git a/packages/moxdns/example/linux/CMakeLists.txt b/example/linux/CMakeLists.txt similarity index 100% rename from packages/moxdns/example/linux/CMakeLists.txt rename to example/linux/CMakeLists.txt diff --git a/packages/moxdns/example/linux/flutter/CMakeLists.txt b/example/linux/flutter/CMakeLists.txt similarity index 100% rename from packages/moxdns/example/linux/flutter/CMakeLists.txt rename to example/linux/flutter/CMakeLists.txt diff --git a/packages/moxdns/example/linux/flutter/generated_plugin_registrant.cc b/example/linux/flutter/generated_plugin_registrant.cc similarity index 100% rename from packages/moxdns/example/linux/flutter/generated_plugin_registrant.cc rename to example/linux/flutter/generated_plugin_registrant.cc diff --git a/packages/moxdns/example/linux/flutter/generated_plugin_registrant.h b/example/linux/flutter/generated_plugin_registrant.h similarity index 100% rename from packages/moxdns/example/linux/flutter/generated_plugin_registrant.h rename to example/linux/flutter/generated_plugin_registrant.h diff --git a/packages/moxdns/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake similarity index 100% rename from packages/moxdns/example/linux/flutter/generated_plugins.cmake rename to example/linux/flutter/generated_plugins.cmake diff --git a/packages/moxdns/example/linux/main.cc b/example/linux/main.cc similarity index 100% rename from packages/moxdns/example/linux/main.cc rename to example/linux/main.cc diff --git a/packages/moxdns/example/linux/my_application.cc b/example/linux/my_application.cc similarity index 100% rename from packages/moxdns/example/linux/my_application.cc rename to example/linux/my_application.cc diff --git a/packages/moxdns/example/linux/my_application.h b/example/linux/my_application.h similarity index 100% rename from packages/moxdns/example/linux/my_application.h rename to example/linux/my_application.h diff --git a/packages/moxdns/example/pubspec.lock b/example/pubspec.lock similarity index 92% rename from packages/moxdns/example/pubspec.lock rename to example/pubspec.lock index cf9415c..213a6f7 100644 --- a/packages/moxdns/example/pubspec.lock +++ b/example/pubspec.lock @@ -105,31 +105,31 @@ packages: moxdns: dependency: "direct main" description: - path: ".." + path: "../packages/moxdns" relative: true source: path - version: "0.1.0" + version: "0.1.1" moxdns_android: - dependency: transitive + dependency: "direct overridden" description: - path: "../../moxdns_android" + path: "../packages/moxdns_android" relative: true source: path - version: "0.1.0" + version: "0.1.1" moxdns_linux: - dependency: transitive + dependency: "direct overridden" description: - path: "../../moxdns_linux" + path: "../packages/moxdns_linux" relative: true source: path - version: "0.1.0" + version: "0.1.1" moxdns_platform_interface: - dependency: transitive + dependency: "direct overridden" description: - path: "../../moxdns_platform_interface" + path: "../packages/moxdns_platform_interface" relative: true source: path - version: "0.1.0" + version: "0.1.1" path: dependency: transitive description: @@ -200,4 +200,3 @@ packages: version: "2.1.2" sdks: dart: ">=2.17.0-266.1.beta <3.0.0" - flutter: ">=2.5.0" diff --git a/packages/moxdns/example/pubspec.yaml b/example/pubspec.yaml similarity index 98% rename from packages/moxdns/example/pubspec.yaml rename to example/pubspec.yaml index fed7053..458122d 100644 --- a/packages/moxdns/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -31,7 +31,8 @@ dependencies: sdk: flutter moxdns: - path: ../ + hosted: https://pub.polynom.me + version: 0.1.1 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. diff --git a/packages/moxdns/example/test/widget_test.dart b/example/test/widget_test.dart similarity index 100% rename from packages/moxdns/example/test/widget_test.dart rename to example/test/widget_test.dart diff --git a/melos.yaml b/melos.yaml new file mode 100644 index 0000000..561d555 --- /dev/null +++ b/melos.yaml @@ -0,0 +1,12 @@ +name: moxdns +packages: + - packages/** + - example/** + +command: + bootstrap: + usePubspecOverrides: true + +scripts: + analyze: + exec: dart analyze . diff --git a/packages/moxdns_android/analysis_options.yaml b/packages/moxdns_android/analysis_options.yaml index b3a83ec..f04c6cf 100644 --- a/packages/moxdns_android/analysis_options.yaml +++ b/packages/moxdns_android/analysis_options.yaml @@ -1,8 +1 @@ -include: package:very_good_analysis/analysis_options.yaml -linter: - rules: - public_member_api_docs: false - lines_longer_than_80_chars: false - use_setters_to_change_properties: false - avoid_positional_boolean_parameters: false - avoid_bool_literals_in_conditional_expressions: false +include: ../../analysis_options.yaml diff --git a/packages/moxdns_linux/analysis_options.yaml b/packages/moxdns_linux/analysis_options.yaml index b3a83ec..f04c6cf 100644 --- a/packages/moxdns_linux/analysis_options.yaml +++ b/packages/moxdns_linux/analysis_options.yaml @@ -1,8 +1 @@ -include: package:very_good_analysis/analysis_options.yaml -linter: - rules: - public_member_api_docs: false - lines_longer_than_80_chars: false - use_setters_to_change_properties: false - avoid_positional_boolean_parameters: false - avoid_bool_literals_in_conditional_expressions: false +include: ../../analysis_options.yaml diff --git a/packages/moxdns_platform_interface/analysis_options.yaml b/packages/moxdns_platform_interface/analysis_options.yaml index b3a83ec..f04c6cf 100644 --- a/packages/moxdns_platform_interface/analysis_options.yaml +++ b/packages/moxdns_platform_interface/analysis_options.yaml @@ -1,8 +1 @@ -include: package:very_good_analysis/analysis_options.yaml -linter: - rules: - public_member_api_docs: false - lines_longer_than_80_chars: false - use_setters_to_change_properties: false - avoid_positional_boolean_parameters: false - avoid_bool_literals_in_conditional_expressions: false +include: ../../analysis_options.yaml