From 5cb4f7d2aa2eefbce2537705daf1d820940fccf7 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Wed, 13 Dec 2023 10:19:58 -0500 Subject: [PATCH] style(flutter, lint): fix all pub check issues - use modern melos and configure it correctly - requires root-level pubspec - requires gitignore of pubspecs overrides - ...but pubspecs overrides allow internal cross-linking so pub check passes - required command-line level filter of test exec run to ignore example --- .github/workflows/scripts/install-tools.sh | 2 +- packages/flutter/.gitignore | 1 + packages/flutter/melos.yaml | 7 +- .../notifee/example/pubspec_overrides.yaml | 6 - .../flutter/packages/notifee/pubspec.yaml | 2 +- .../packages/notifee/pubspec_overrides.yaml | 4 - .../notifee_platform_interface/pubspec.yaml | 2 +- packages/flutter/pubspec.lock | 325 ++++++++++++++++++ packages/flutter/pubspec.yaml | 6 + 9 files changed, 336 insertions(+), 19 deletions(-) create mode 100644 packages/flutter/.gitignore delete mode 100644 packages/flutter/packages/notifee/example/pubspec_overrides.yaml delete mode 100644 packages/flutter/packages/notifee/pubspec_overrides.yaml create mode 100644 packages/flutter/pubspec.lock create mode 100644 packages/flutter/pubspec.yaml diff --git a/.github/workflows/scripts/install-tools.sh b/.github/workflows/scripts/install-tools.sh index 245eecb2a..be5120cd3 100755 --- a/.github/workflows/scripts/install-tools.sh +++ b/.github/workflows/scripts/install-tools.sh @@ -1,7 +1,7 @@ #!/bin/bash flutter config --no-analytics -flutter pub global activate melos 1.1.0 +flutter pub global activate melos flutter pub global activate flutter_plugin_tools echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH echo "$GITHUB_WORKSPACE/_flutter/.pub-cache/bin" >> $GITHUB_PATH diff --git a/packages/flutter/.gitignore b/packages/flutter/.gitignore new file mode 100644 index 000000000..671e1c914 --- /dev/null +++ b/packages/flutter/.gitignore @@ -0,0 +1 @@ +pubspec_overrides.yaml diff --git a/packages/flutter/melos.yaml b/packages/flutter/melos.yaml index 25078920b..717aaa0fe 100644 --- a/packages/flutter/melos.yaml +++ b/packages/flutter/melos.yaml @@ -39,14 +39,9 @@ scripts: test: run: | - melos exec -c 6 --fail-fast -- \ + melos exec -c 6 --fail-fast --ignore="*example*" -- \ "flutter test --no-pub" description: Run `flutter test` for a specific package. - select-package: - dir-exists: - - test - ignore: - - "*example*" # Additional cleanup lifecycle script, executed when `melos clean` is run. postclean: > diff --git a/packages/flutter/packages/notifee/example/pubspec_overrides.yaml b/packages/flutter/packages/notifee/example/pubspec_overrides.yaml deleted file mode 100644 index f0cb6da46..000000000 --- a/packages/flutter/packages/notifee/example/pubspec_overrides.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# melos_managed_dependency_overrides: notifee,notifee_platform_interface -dependency_overrides: - notifee: - path: ../ - notifee_platform_interface: - path: ../../notifee_platform_interface diff --git a/packages/flutter/packages/notifee/pubspec.yaml b/packages/flutter/packages/notifee/pubspec.yaml index 9e0b7a6af..baa079f1e 100644 --- a/packages/flutter/packages/notifee/pubspec.yaml +++ b/packages/flutter/packages/notifee/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/invertase/notifee/tree/main/packages/flutter/packag repository: https://github.com/invertase/notifee/tree/main/packages/flutter/packages/notifee environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.12.0 <4.0.0' flutter: '>=1.17.0' dependencies: diff --git a/packages/flutter/packages/notifee/pubspec_overrides.yaml b/packages/flutter/packages/notifee/pubspec_overrides.yaml deleted file mode 100644 index e8d4ed39e..000000000 --- a/packages/flutter/packages/notifee/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: notifee_platform_interface -dependency_overrides: - notifee_platform_interface: - path: ../notifee_platform_interface diff --git a/packages/flutter/packages/notifee_platform_interface/pubspec.yaml b/packages/flutter/packages/notifee_platform_interface/pubspec.yaml index af49e0ff6..3c42ed354 100644 --- a/packages/flutter/packages/notifee_platform_interface/pubspec.yaml +++ b/packages/flutter/packages/notifee_platform_interface/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/invertase/notifee/tree/master/packages/flutter/pa version: 0.0.1 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" flutter: ">=1.20.0" dependencies: diff --git a/packages/flutter/pubspec.lock b/packages/flutter/pubspec.lock new file mode 100644 index 000000000..e9dd4c843 --- /dev/null +++ b/packages/flutter/pubspec.lock @@ -0,0 +1,325 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + ansi_styles: + dependency: transitive + description: + name: ansi_styles + sha256: "9c656cc12b3c27b17dd982b2cc5c0cfdfbdabd7bc8f3ae5e8542d9867b47ce8a" + url: "https://pub.dev" + source: hosted + version: "0.3.2+1" + args: + dependency: transitive + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" + async: + dependency: transitive + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + charcode: + dependency: transitive + description: + name: charcode + sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306 + url: "https://pub.dev" + source: hosted + version: "1.3.1" + cli_launcher: + dependency: transitive + description: + name: cli_launcher + sha256: "5e7e0282b79e8642edd6510ee468ae2976d847a0a29b3916e85f5fa1bfe24005" + url: "https://pub.dev" + source: hosted + version: "0.3.1" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 + url: "https://pub.dev" + source: hosted + version: "0.4.0" + collection: + dependency: transitive + description: + name: collection + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" + source: hosted + version: "1.18.0" + conventional_commit: + dependency: transitive + description: + name: conventional_commit + sha256: dec15ad1118f029c618651a4359eb9135d8b88f761aa24e4016d061cd45948f2 + url: "https://pub.dev" + source: hosted + version: "0.6.0+1" + file: + dependency: transitive + description: + name: file + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + glob: + dependency: transitive + description: + name: glob + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + graphs: + dependency: transitive + description: + name: graphs + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + url: "https://pub.dev" + source: hosted + version: "2.3.1" + http: + dependency: transitive + description: + name: http + sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 + url: "https://pub.dev" + source: hosted + version: "1.1.2" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + io: + dependency: transitive + description: + name: io + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + url: "https://pub.dev" + source: hosted + version: "4.8.1" + matcher: + dependency: transitive + description: + name: matcher + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" + source: hosted + version: "0.12.16" + melos: + dependency: "direct dev" + description: + name: melos + sha256: "96e64bbade5712c3f010137e195bca9f1b351fac34ab1f322af492ae34032067" + url: "https://pub.dev" + source: hosted + version: "3.4.0" + meta: + dependency: transitive + description: + name: meta + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + url: "https://pub.dev" + source: hosted + version: "1.11.0" + mustache_template: + dependency: transitive + description: + name: mustache_template + sha256: a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c + url: "https://pub.dev" + source: hosted + version: "2.0.0" + path: + dependency: transitive + description: + name: path + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" + source: hosted + version: "1.9.0" + platform: + dependency: transitive + description: + name: platform + sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59" + url: "https://pub.dev" + source: hosted + version: "3.1.3" + pool: + dependency: transitive + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + process: + dependency: transitive + description: + name: process + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" + source: hosted + version: "4.2.4" + prompts: + dependency: transitive + description: + name: prompts + sha256: "3773b845e85a849f01e793c4fc18a45d52d7783b4cb6c0569fad19f9d0a774a1" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + pub_updater: + dependency: transitive + description: + name: pub_updater + sha256: b06600619c8c219065a548f8f7c192b3e080beff95488ed692780f48f69c0625 + url: "https://pub.dev" + source: hosted + version: "0.3.1" + pubspec: + dependency: transitive + description: + name: pubspec + sha256: f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e + url: "https://pub.dev" + source: hosted + version: "2.3.0" + quiver: + dependency: transitive + description: + name: quiver + sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + url: "https://pub.dev" + source: hosted + version: "3.2.1" + source_span: + dependency: transitive + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" + source: hosted + version: "1.11.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" + source: hosted + version: "2.1.2" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + test_api: + dependency: transitive + description: + name: test_api + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + url: "https://pub.dev" + source: hosted + version: "0.6.1" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" + uri: + dependency: transitive + description: + name: uri + sha256: "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + web: + dependency: transitive + description: + name: web + sha256: edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa + url: "https://pub.dev" + source: hosted + version: "0.4.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" + yaml_edit: + dependency: transitive + description: + name: yaml_edit + sha256: "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd" + url: "https://pub.dev" + source: hosted + version: "2.1.1" +sdks: + dart: ">=3.2.0 <4.0.0" diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml new file mode 100644 index 000000000..624595aa7 --- /dev/null +++ b/packages/flutter/pubspec.yaml @@ -0,0 +1,6 @@ +name: notifee_workspace + +environment: + sdk: '>=2.18.0 <4.0.0' +dev_dependencies: + melos: ^3.4.0