From 3cd40de21151126286e4598f0d0b1d45baf07042 Mon Sep 17 00:00:00 2001 From: Felix Angelov Date: Mon, 2 Jun 2025 15:17:00 -0500 Subject: [PATCH] refactor: migrate to workspaces (#3135) --- .github/actions/dart_package/action.yaml | 13 +- .github/actions/license_check/action.yaml | 33 + .github/workflows/main.yaml | 16 + .gitignore | 19 +- analysis_options.yaml | 12 +- cspell.config.yaml | 2 + packages/artifact_proxy/analysis_options.yaml | 2 +- packages/artifact_proxy/pubspec.lock | 597 ------------ packages/artifact_proxy/pubspec.yaml | 2 +- .../discord_gcp_alerts/analysis_options.yaml | 2 +- packages/discord_gcp_alerts/pubspec.lock | 589 ------------ packages/discord_gcp_alerts/pubspec.yaml | 2 +- packages/jwt/analysis_options.yaml | 2 +- packages/jwt/pubspec.yaml | 2 +- packages/redis_client/analysis_options.yaml | 7 +- packages/redis_client/pubspec.yaml | 2 +- packages/scoped_deps/analysis_options.yaml | 7 +- packages/scoped_deps/pubspec.yaml | 2 +- packages/shorebird_cli/analysis_options.yaml | 13 +- .../artifact_builder/artifact_builder.dart | 15 +- .../lib/src/code_push_client_wrapper.dart | 6 +- .../config/flutter_config_command.dart | 2 +- .../lib/src/commands/preview_command.dart | 2 +- .../src/commands/release/release_command.dart | 127 +-- .../lib/src/shorebird_process.dart | 7 +- packages/shorebird_cli/pubspec.lock | 866 ------------------ packages/shorebird_cli/pubspec.yaml | 4 +- .../config/flutter_config_command_test.dart | 2 +- .../release/ios_framework_releaser_test.dart | 3 +- .../test/src/platform/apple_test.dart | 2 +- .../src/shorebird_android_artifacts_test.dart | 2 +- .../test/src/shorebird_validator_test.dart | 3 +- ...os_network_entitlement_validator_test.dart | 4 + .../analysis_options.yaml | 2 +- .../shorebird_code_push_client/pubspec.yaml | 2 +- .../analysis_options.yaml | 3 +- .../shorebird_code_push_protocol/pubspec.yaml | 2 +- pubspec.yaml | 16 + 38 files changed, 210 insertions(+), 2184 deletions(-) create mode 100644 .github/actions/license_check/action.yaml delete mode 100644 packages/artifact_proxy/pubspec.lock delete mode 100644 packages/discord_gcp_alerts/pubspec.lock delete mode 100644 packages/shorebird_cli/pubspec.lock create mode 100644 pubspec.yaml diff --git a/.github/actions/dart_package/action.yaml b/.github/actions/dart_package/action.yaml index 7ce2d8fb..3552d7a7 100644 --- a/.github/actions/dart_package/action.yaml +++ b/.github/actions/dart_package/action.yaml @@ -37,6 +37,10 @@ inputs: required: false default: "vm" description: Platform to use when running tests + workspace_root: + required: false + default: "." + description: The root of the project workspace (if using Dart workspaces) runs: using: "composite" @@ -61,19 +65,12 @@ runs: shell: ${{ inputs.shell }} run: dart analyze --fatal-warnings ${{inputs.analyze_directories}} - - name: ๐Ÿ“„ License Check - working-directory: ${{ inputs.working_directory }} - shell: ${{ inputs.shell }} - run: | - dart pub global activate very_good_cli - very_good packages check licenses --allowed="MIT,BSD-3-Clause,BSD-2-Clause,Apache-2.0" - - name: ๐Ÿงช Test working-directory: ${{ inputs.working_directory }} shell: ${{ inputs.shell }} run: | dart pub global activate coverage - dart test -j ${{inputs.concurrency}} --coverage=coverage --platform=${{inputs.platform}} && dart pub global run coverage:format_coverage --lcov --in=coverage --out=coverage/lcov.info --packages=.dart_tool/package_config.json --report-on=${{inputs.report_on}} --check-ignore + dart test -j ${{inputs.concurrency}} --coverage=coverage --platform=${{inputs.platform}} && dart pub global run coverage:format_coverage --lcov --in=coverage --out=coverage/lcov.info --packages=${{inputs.workspace_root}}/.dart_tool/package_config.json --report-on=${{inputs.report_on}} --check-ignore # Per https://stackoverflow.com/questions/73402042/github-action-expressions-split-string - name: ๐Ÿ”— Split package name diff --git a/.github/actions/license_check/action.yaml b/.github/actions/license_check/action.yaml new file mode 100644 index 00000000..be102981 --- /dev/null +++ b/.github/actions/license_check/action.yaml @@ -0,0 +1,33 @@ +name: License Check Workflow +description: Check licenses. + +inputs: + dart_sdk: + required: false + default: "stable" + description: "The dart sdk version to use" + working_directory: + required: false + default: "." + description: The working directory for this workflow + +runs: + using: "composite" + steps: + - name: ๐ŸŽฏ Setup Dart + uses: dart-lang/setup-dart@v1 + with: + sdk: ${{ inputs.dart_sdk }} + + - name: ๐Ÿ“ฆ Install Dependencies + working-directory: ${{ inputs.working_directory }} + shell: ${{ inputs.shell }} + run: dart pub get + + - name: ๐Ÿ“„ License Check + working-directory: ${{ inputs.working_directory }} + shell: ${{ inputs.shell }} + run: | + # https://github.com/VeryGoodOpenSource/very_good_cli/issues/1260 + dart pub global activate -sgit https://github.com/VeryGoodOpenSource/very_good_cli.git --git-ref 5acb9d2cb35085d007be7dbd97499db444eb3d56 + very_good packages check licenses --allowed="MIT,BSD-3-Clause,BSD-2-Clause,Apache-2.0" --dependency-type="direct-main,transitive" diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 0ec63dc0..c3429f98 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -11,6 +11,18 @@ on: - main jobs: + license_check: + name: ๐Ÿ“„ License Check + runs-on: ubuntu-latest + steps: + - name: ๐Ÿ“š Git Checkout + uses: actions/checkout@v4 + + - name: ๐Ÿ‘€ Check Licenses + uses: ./.github/actions/license_check + with: + working_directory: ${{ github.workspace }} + semantic_pull_request: name: โœ… Semantic Pull Request uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/semantic_pull_request.yml@v1 @@ -134,6 +146,7 @@ jobs: with: codecov_token: ${{ secrets.CODECOV_TOKEN }} working_directory: packages/${{ matrix.package }} + workspace_root: ${{ github.workspace }} build_cross_platform_dart_packages: needs: changes @@ -157,6 +170,7 @@ jobs: with: codecov_token: ${{ secrets.CODECOV_TOKEN }} working_directory: packages/${{ matrix.package }} + workspace_root: ${{ github.workspace }} build_redis: needs: changes @@ -186,6 +200,7 @@ jobs: with: codecov_token: ${{ secrets.CODECOV_TOKEN }} working_directory: packages/${{ matrix.package }} + workspace_root: ${{ github.workspace }} verify_packages: needs: changes @@ -211,6 +226,7 @@ jobs: ci: needs: [ + license_check, semantic_pull_request, build_cross_platform_dart_packages, build_dart_packages, diff --git a/.gitignore b/.gitignore index e2bf94c0..de4d86e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,18 @@ +# See https://www.dartlang.org/guides/libraries/private-files +# Files and directories created by pub +.dart_tool/ +.packages +build/ +pubspec.lock + +# Test related files +# Coverage directories used by Flutter & Dart tests +logs/ +coverage/ +coverage_badge.svg + # Cached files bin/cache/ -# Coverage directories used by Flutter & Dart tests -coverage/ -logs/ + +# Misc +.DS_Store diff --git a/analysis_options.yaml b/analysis_options.yaml index da25ff02..c093856f 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,2 +1,12 @@ +include: package:very_good_analysis/analysis_options.8.0.0.yaml analyzer: - exclude: [bin/cache/**] + exclude: + - bin/cache/** + - lib/**.g.dart +linter: + rules: + # Experimental and there are lots of false positives + specify_nonobvious_property_types: false +formatter: + page_width: 80 + trailing_commas: preserve diff --git a/cspell.config.yaml b/cspell.config.yaml index 43adc695..e1ffc54e 100644 --- a/cspell.config.yaml +++ b/cspell.config.yaml @@ -71,6 +71,7 @@ words: - multioption - noaudio # From .github dir, doesn't show up in "**" check? - NOAUTH + - nonobvious # From analysis_options.yaml - nserror - Oltman - orri # Arm64 instruction, Or Register with Immediate @@ -96,6 +97,7 @@ words: - Retryable - RSAPKCS - sdcard # From .github/workflows/e2e.yaml + - sgit # From .github/license_check/action.yaml - shorebirdtech - sideload - sideloadable diff --git a/packages/artifact_proxy/analysis_options.yaml b/packages/artifact_proxy/analysis_options.yaml index c2f4cbbc..fac60e24 100644 --- a/packages/artifact_proxy/analysis_options.yaml +++ b/packages/artifact_proxy/analysis_options.yaml @@ -1 +1 @@ -include: package:very_good_analysis/analysis_options.7.0.0.yaml +include: ../../analysis_options.yaml \ No newline at end of file diff --git a/packages/artifact_proxy/pubspec.lock b/packages/artifact_proxy/pubspec.lock deleted file mode 100644 index 4bf1c126..00000000 --- a/packages/artifact_proxy/pubspec.lock +++ /dev/null @@ -1,597 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - _fe_analyzer_shared: - dependency: transitive - description: - name: _fe_analyzer_shared - sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f - url: "https://pub.dev" - source: hosted - version: "82.0.0" - analyzer: - dependency: transitive - description: - name: analyzer - sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0" - url: "https://pub.dev" - source: hosted - version: "7.4.5" - args: - dependency: transitive - description: - name: args - sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 - url: "https://pub.dev" - source: hosted - version: "2.7.0" - async: - dependency: transitive - description: - name: async - sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" - url: "https://pub.dev" - source: hosted - version: "2.13.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" - url: "https://pub.dev" - source: hosted - version: "2.1.2" - build: - dependency: transitive - description: - name: build - sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0 - url: "https://pub.dev" - source: hosted - version: "2.4.2" - build_config: - dependency: transitive - description: - name: build_config - sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" - url: "https://pub.dev" - source: hosted - version: "1.1.2" - build_daemon: - dependency: transitive - description: - name: build_daemon - sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa" - url: "https://pub.dev" - source: hosted - version: "4.0.4" - build_resolvers: - dependency: transitive - description: - name: build_resolvers - sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0 - url: "https://pub.dev" - source: hosted - version: "2.4.4" - build_runner: - dependency: "direct dev" - description: - name: build_runner - sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99" - url: "https://pub.dev" - source: hosted - version: "2.4.15" - build_runner_core: - dependency: transitive - description: - name: build_runner_core - sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021" - url: "https://pub.dev" - source: hosted - version: "8.0.0" - built_collection: - dependency: transitive - description: - name: built_collection - sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" - url: "https://pub.dev" - source: hosted - version: "5.1.1" - built_value: - dependency: transitive - description: - name: built_value - sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4 - url: "https://pub.dev" - source: hosted - version: "8.9.5" - checked_yaml: - dependency: "direct main" - description: - name: checked_yaml - sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff - url: "https://pub.dev" - source: hosted - version: "2.0.3" - cli_config: - dependency: transitive - description: - name: cli_config - sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec - url: "https://pub.dev" - source: hosted - version: "0.2.0" - code_builder: - dependency: transitive - description: - name: code_builder - sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" - url: "https://pub.dev" - source: hosted - version: "4.10.1" - collection: - dependency: "direct main" - description: - name: collection - sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" - url: "https://pub.dev" - source: hosted - version: "1.19.1" - convert: - dependency: transitive - description: - name: convert - sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 - url: "https://pub.dev" - source: hosted - version: "3.1.2" - coverage: - dependency: transitive - description: - name: coverage - sha256: "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d" - url: "https://pub.dev" - source: hosted - version: "1.13.1" - crypto: - dependency: transitive - description: - name: crypto - sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" - url: "https://pub.dev" - source: hosted - version: "3.0.6" - dart_style: - dependency: transitive - description: - name: dart_style - sha256: "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af" - url: "https://pub.dev" - source: hosted - version: "3.1.0" - file: - dependency: transitive - description: - name: file - sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 - url: "https://pub.dev" - source: hosted - version: "7.0.1" - fixnum: - dependency: transitive - description: - name: fixnum - sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be - url: "https://pub.dev" - source: hosted - version: "1.1.1" - frontend_server_client: - dependency: transitive - description: - name: frontend_server_client - sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 - url: "https://pub.dev" - source: hosted - version: "4.0.0" - glob: - dependency: transitive - description: - name: glob - sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de - url: "https://pub.dev" - source: hosted - version: "2.1.3" - graphs: - dependency: transitive - description: - name: graphs - sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" - url: "https://pub.dev" - source: hosted - version: "2.3.2" - hotreloader: - dependency: transitive - description: - name: hotreloader - sha256: bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b - url: "https://pub.dev" - source: hosted - version: "4.3.0" - http: - dependency: "direct main" - description: - name: http - sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b" - url: "https://pub.dev" - source: hosted - version: "1.4.0" - http_multi_server: - dependency: transitive - description: - name: http_multi_server - sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 - url: "https://pub.dev" - source: hosted - version: "3.2.2" - http_parser: - dependency: transitive - description: - name: http_parser - sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" - url: "https://pub.dev" - source: hosted - version: "4.1.2" - io: - dependency: transitive - description: - name: io - sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b - url: "https://pub.dev" - source: hosted - version: "1.0.5" - js: - dependency: transitive - description: - name: js - sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" - url: "https://pub.dev" - source: hosted - version: "0.7.2" - json_annotation: - dependency: "direct main" - description: - name: json_annotation - sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" - url: "https://pub.dev" - source: hosted - version: "4.9.0" - json_serializable: - dependency: "direct dev" - description: - name: json_serializable - sha256: c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c - url: "https://pub.dev" - source: hosted - version: "6.9.5" - logging: - dependency: transitive - description: - name: logging - sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 - url: "https://pub.dev" - source: hosted - version: "1.3.0" - matcher: - dependency: transitive - description: - name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 - url: "https://pub.dev" - source: hosted - version: "0.12.17" - meta: - dependency: transitive - description: - name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" - url: "https://pub.dev" - source: hosted - version: "1.17.0" - mime: - dependency: transitive - description: - name: mime - sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" - url: "https://pub.dev" - source: hosted - version: "2.0.0" - mocktail: - dependency: "direct dev" - description: - name: mocktail - sha256: "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8" - url: "https://pub.dev" - source: hosted - version: "1.0.4" - node_preamble: - dependency: transitive - description: - name: node_preamble - sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" - url: "https://pub.dev" - source: hosted - version: "2.0.2" - package_config: - dependency: transitive - description: - name: package_config - sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc - url: "https://pub.dev" - source: hosted - version: "2.2.0" - path: - dependency: transitive - description: - name: path - sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" - url: "https://pub.dev" - source: hosted - version: "1.9.1" - pool: - dependency: transitive - description: - name: pool - sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" - url: "https://pub.dev" - source: hosted - version: "1.5.1" - pub_semver: - dependency: transitive - description: - name: pub_semver - sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" - url: "https://pub.dev" - source: hosted - version: "2.2.0" - pubspec_parse: - dependency: transitive - description: - name: pubspec_parse - sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" - url: "https://pub.dev" - source: hosted - version: "1.5.0" - quiver: - dependency: "direct main" - description: - name: quiver - sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 - url: "https://pub.dev" - source: hosted - version: "3.2.2" - shelf: - dependency: "direct main" - description: - name: shelf - sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 - url: "https://pub.dev" - source: hosted - version: "1.4.2" - shelf_hotreload: - dependency: "direct main" - description: - name: shelf_hotreload - sha256: d7099618b18d3c63ba5272491c1812c306629495129ef9996115f0417902f963 - url: "https://pub.dev" - source: hosted - version: "1.5.0" - shelf_packages_handler: - dependency: transitive - description: - name: shelf_packages_handler - sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" - url: "https://pub.dev" - source: hosted - version: "3.0.2" - shelf_static: - dependency: transitive - description: - name: shelf_static - sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 - url: "https://pub.dev" - source: hosted - version: "1.1.3" - shelf_web_socket: - dependency: transitive - description: - name: shelf_web_socket - sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - source_gen: - dependency: transitive - description: - name: source_gen - sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b" - url: "https://pub.dev" - source: hosted - version: "2.0.0" - source_helper: - dependency: transitive - description: - name: source_helper - sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c" - url: "https://pub.dev" - source: hosted - version: "1.3.5" - source_map_stack_trace: - dependency: transitive - description: - name: source_map_stack_trace - sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b - url: "https://pub.dev" - source: hosted - version: "2.1.2" - source_maps: - dependency: transitive - description: - name: source_maps - sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812" - url: "https://pub.dev" - source: hosted - version: "0.10.13" - source_span: - dependency: transitive - description: - name: source_span - sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" - url: "https://pub.dev" - source: hosted - version: "1.10.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" - url: "https://pub.dev" - source: hosted - version: "1.12.1" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" - url: "https://pub.dev" - source: hosted - version: "2.1.4" - stream_transform: - dependency: transitive - description: - name: stream_transform - sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" - url: "https://pub.dev" - source: hosted - version: "1.4.1" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" - url: "https://pub.dev" - source: hosted - version: "1.2.2" - test: - dependency: "direct dev" - description: - name: test - sha256: "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb" - url: "https://pub.dev" - source: hosted - version: "1.26.2" - test_api: - dependency: transitive - description: - name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" - url: "https://pub.dev" - source: hosted - version: "0.7.6" - test_core: - dependency: transitive - description: - name: test_core - sha256: "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a" - url: "https://pub.dev" - source: hosted - version: "0.6.11" - timing: - dependency: transitive - description: - name: timing - sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" - url: "https://pub.dev" - source: hosted - version: "1.0.2" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 - url: "https://pub.dev" - source: hosted - version: "1.4.0" - very_good_analysis: - dependency: "direct dev" - description: - name: very_good_analysis - sha256: "62d2b86d183fb81b2edc22913d9f155d26eb5cf3855173adb1f59fac85035c63" - url: "https://pub.dev" - source: hosted - version: "7.0.0" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: "6f82e9ee8e7339f5d8b699317f6f3afc17c80a68ebef1bc0d6f52a678c14b1e6" - url: "https://pub.dev" - source: hosted - version: "15.0.1" - watcher: - dependency: transitive - description: - name: watcher - sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" - url: "https://pub.dev" - source: hosted - version: "1.1.1" - web: - dependency: transitive - description: - name: web - sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" - url: "https://pub.dev" - source: hosted - version: "1.1.1" - web_socket: - dependency: transitive - description: - name: web_socket - sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" - url: "https://pub.dev" - source: hosted - version: "1.0.1" - web_socket_channel: - dependency: transitive - description: - name: web_socket_channel - sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 - url: "https://pub.dev" - source: hosted - version: "3.0.3" - webkit_inspection_protocol: - dependency: transitive - description: - name: webkit_inspection_protocol - sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" - url: "https://pub.dev" - source: hosted - version: "1.2.1" - yaml: - dependency: transitive - description: - name: yaml - sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce - url: "https://pub.dev" - source: hosted - version: "3.1.3" -sdks: - dart: ">=3.8.0 <4.0.0" diff --git a/packages/artifact_proxy/pubspec.yaml b/packages/artifact_proxy/pubspec.yaml index 28b86d6d..b47b2ab2 100644 --- a/packages/artifact_proxy/pubspec.yaml +++ b/packages/artifact_proxy/pubspec.yaml @@ -3,6 +3,7 @@ description: Intercept and proxy Flutter artifact requests. version: 1.0.0 repository: https://github.com/shorebirdtech/shorebird/ publish_to: "none" +resolution: workspace environment: sdk: ">=3.8.0 <4.0.0" @@ -21,4 +22,3 @@ dev_dependencies: json_serializable: ^6.9.5 mocktail: ^1.0.4 test: ^1.25.15 - very_good_analysis: ^7.0.0 diff --git a/packages/discord_gcp_alerts/analysis_options.yaml b/packages/discord_gcp_alerts/analysis_options.yaml index 6a8b2fcf..fac60e24 100644 --- a/packages/discord_gcp_alerts/analysis_options.yaml +++ b/packages/discord_gcp_alerts/analysis_options.yaml @@ -1 +1 @@ -include: package:very_good_analysis/analysis_options.7.0.0.yaml \ No newline at end of file +include: ../../analysis_options.yaml \ No newline at end of file diff --git a/packages/discord_gcp_alerts/pubspec.lock b/packages/discord_gcp_alerts/pubspec.lock deleted file mode 100644 index 7e7ee475..00000000 --- a/packages/discord_gcp_alerts/pubspec.lock +++ /dev/null @@ -1,589 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - _fe_analyzer_shared: - dependency: transitive - description: - name: _fe_analyzer_shared - sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f - url: "https://pub.dev" - source: hosted - version: "82.0.0" - analyzer: - dependency: transitive - description: - name: analyzer - sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0" - url: "https://pub.dev" - source: hosted - version: "7.4.5" - args: - dependency: transitive - description: - name: args - sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 - url: "https://pub.dev" - source: hosted - version: "2.7.0" - async: - dependency: transitive - description: - name: async - sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" - url: "https://pub.dev" - source: hosted - version: "2.13.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" - url: "https://pub.dev" - source: hosted - version: "2.1.2" - build: - dependency: transitive - description: - name: build - sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0 - url: "https://pub.dev" - source: hosted - version: "2.4.2" - build_config: - dependency: transitive - description: - name: build_config - sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" - url: "https://pub.dev" - source: hosted - version: "1.1.2" - build_daemon: - dependency: transitive - description: - name: build_daemon - sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa" - url: "https://pub.dev" - source: hosted - version: "4.0.4" - build_resolvers: - dependency: transitive - description: - name: build_resolvers - sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0 - url: "https://pub.dev" - source: hosted - version: "2.4.4" - build_runner: - dependency: "direct dev" - description: - name: build_runner - sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99" - url: "https://pub.dev" - source: hosted - version: "2.4.15" - build_runner_core: - dependency: transitive - description: - name: build_runner_core - sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021" - url: "https://pub.dev" - source: hosted - version: "8.0.0" - built_collection: - dependency: transitive - description: - name: built_collection - sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" - url: "https://pub.dev" - source: hosted - version: "5.1.1" - built_value: - dependency: transitive - description: - name: built_value - sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4 - url: "https://pub.dev" - source: hosted - version: "8.9.5" - checked_yaml: - dependency: transitive - description: - name: checked_yaml - sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff - url: "https://pub.dev" - source: hosted - version: "2.0.3" - cli_config: - dependency: transitive - description: - name: cli_config - sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec - url: "https://pub.dev" - source: hosted - version: "0.2.0" - code_builder: - dependency: transitive - description: - name: code_builder - sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" - url: "https://pub.dev" - source: hosted - version: "4.10.1" - collection: - dependency: transitive - description: - name: collection - sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" - url: "https://pub.dev" - source: hosted - version: "1.19.1" - convert: - dependency: transitive - description: - name: convert - sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 - url: "https://pub.dev" - source: hosted - version: "3.1.2" - coverage: - dependency: transitive - description: - name: coverage - sha256: "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d" - url: "https://pub.dev" - source: hosted - version: "1.13.1" - crypto: - dependency: transitive - description: - name: crypto - sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" - url: "https://pub.dev" - source: hosted - version: "3.0.6" - dart_style: - dependency: transitive - description: - name: dart_style - sha256: "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af" - url: "https://pub.dev" - source: hosted - version: "3.1.0" - file: - dependency: transitive - description: - name: file - sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 - url: "https://pub.dev" - source: hosted - version: "7.0.1" - fixnum: - dependency: transitive - description: - name: fixnum - sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be - url: "https://pub.dev" - source: hosted - version: "1.1.1" - frontend_server_client: - dependency: transitive - description: - name: frontend_server_client - sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 - url: "https://pub.dev" - source: hosted - version: "4.0.0" - glob: - dependency: transitive - description: - name: glob - sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de - url: "https://pub.dev" - source: hosted - version: "2.1.3" - graphs: - dependency: transitive - description: - name: graphs - sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" - url: "https://pub.dev" - source: hosted - version: "2.3.2" - http: - dependency: "direct main" - description: - name: http - sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b" - url: "https://pub.dev" - source: hosted - version: "1.4.0" - http_methods: - dependency: transitive - description: - name: http_methods - sha256: "6bccce8f1ec7b5d701e7921dca35e202d425b57e317ba1a37f2638590e29e566" - url: "https://pub.dev" - source: hosted - version: "1.1.1" - http_multi_server: - dependency: transitive - description: - name: http_multi_server - sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 - url: "https://pub.dev" - source: hosted - version: "3.2.2" - http_parser: - dependency: transitive - description: - name: http_parser - sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" - url: "https://pub.dev" - source: hosted - version: "4.1.2" - io: - dependency: transitive - description: - name: io - sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b - url: "https://pub.dev" - source: hosted - version: "1.0.5" - js: - dependency: transitive - description: - name: js - sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" - url: "https://pub.dev" - source: hosted - version: "0.7.2" - json_annotation: - dependency: "direct main" - description: - name: json_annotation - sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" - url: "https://pub.dev" - source: hosted - version: "4.9.0" - json_serializable: - dependency: "direct dev" - description: - name: json_serializable - sha256: c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c - url: "https://pub.dev" - source: hosted - version: "6.9.5" - logging: - dependency: transitive - description: - name: logging - sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 - url: "https://pub.dev" - source: hosted - version: "1.3.0" - matcher: - dependency: transitive - description: - name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 - url: "https://pub.dev" - source: hosted - version: "0.12.17" - meta: - dependency: transitive - description: - name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" - url: "https://pub.dev" - source: hosted - version: "1.17.0" - mime: - dependency: transitive - description: - name: mime - sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" - url: "https://pub.dev" - source: hosted - version: "2.0.0" - mocktail: - dependency: "direct dev" - description: - name: mocktail - sha256: "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8" - url: "https://pub.dev" - source: hosted - version: "1.0.4" - node_preamble: - dependency: transitive - description: - name: node_preamble - sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" - url: "https://pub.dev" - source: hosted - version: "2.0.2" - package_config: - dependency: transitive - description: - name: package_config - sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc - url: "https://pub.dev" - source: hosted - version: "2.2.0" - path: - dependency: transitive - description: - name: path - sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" - url: "https://pub.dev" - source: hosted - version: "1.9.1" - pool: - dependency: transitive - description: - name: pool - sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" - url: "https://pub.dev" - source: hosted - version: "1.5.1" - pub_semver: - dependency: transitive - description: - name: pub_semver - sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" - url: "https://pub.dev" - source: hosted - version: "2.2.0" - pubspec_parse: - dependency: transitive - description: - name: pubspec_parse - sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" - url: "https://pub.dev" - source: hosted - version: "1.5.0" - shelf: - dependency: "direct main" - description: - name: shelf - sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 - url: "https://pub.dev" - source: hosted - version: "1.4.2" - shelf_packages_handler: - dependency: transitive - description: - name: shelf_packages_handler - sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" - url: "https://pub.dev" - source: hosted - version: "3.0.2" - shelf_router: - dependency: "direct main" - description: - name: shelf_router - sha256: f5e5d492440a7fb165fe1e2e1a623f31f734d3370900070b2b1e0d0428d59864 - url: "https://pub.dev" - source: hosted - version: "1.1.4" - shelf_static: - dependency: transitive - description: - name: shelf_static - sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 - url: "https://pub.dev" - source: hosted - version: "1.1.3" - shelf_web_socket: - dependency: transitive - description: - name: shelf_web_socket - sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - source_gen: - dependency: transitive - description: - name: source_gen - sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b" - url: "https://pub.dev" - source: hosted - version: "2.0.0" - source_helper: - dependency: transitive - description: - name: source_helper - sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c" - url: "https://pub.dev" - source: hosted - version: "1.3.5" - source_map_stack_trace: - dependency: transitive - description: - name: source_map_stack_trace - sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b - url: "https://pub.dev" - source: hosted - version: "2.1.2" - source_maps: - dependency: transitive - description: - name: source_maps - sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812" - url: "https://pub.dev" - source: hosted - version: "0.10.13" - source_span: - dependency: transitive - description: - name: source_span - sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" - url: "https://pub.dev" - source: hosted - version: "1.10.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" - url: "https://pub.dev" - source: hosted - version: "1.12.1" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" - url: "https://pub.dev" - source: hosted - version: "2.1.4" - stream_transform: - dependency: transitive - description: - name: stream_transform - sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" - url: "https://pub.dev" - source: hosted - version: "1.4.1" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" - url: "https://pub.dev" - source: hosted - version: "1.2.2" - test: - dependency: "direct dev" - description: - name: test - sha256: "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb" - url: "https://pub.dev" - source: hosted - version: "1.26.2" - test_api: - dependency: transitive - description: - name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" - url: "https://pub.dev" - source: hosted - version: "0.7.6" - test_core: - dependency: transitive - description: - name: test_core - sha256: "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a" - url: "https://pub.dev" - source: hosted - version: "0.6.11" - timing: - dependency: transitive - description: - name: timing - sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" - url: "https://pub.dev" - source: hosted - version: "1.0.2" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 - url: "https://pub.dev" - source: hosted - version: "1.4.0" - very_good_analysis: - dependency: "direct dev" - description: - name: very_good_analysis - sha256: "62d2b86d183fb81b2edc22913d9f155d26eb5cf3855173adb1f59fac85035c63" - url: "https://pub.dev" - source: hosted - version: "7.0.0" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: "6f82e9ee8e7339f5d8b699317f6f3afc17c80a68ebef1bc0d6f52a678c14b1e6" - url: "https://pub.dev" - source: hosted - version: "15.0.1" - watcher: - dependency: transitive - description: - name: watcher - sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" - url: "https://pub.dev" - source: hosted - version: "1.1.1" - web: - dependency: transitive - description: - name: web - sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" - url: "https://pub.dev" - source: hosted - version: "1.1.1" - web_socket: - dependency: transitive - description: - name: web_socket - sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" - url: "https://pub.dev" - source: hosted - version: "1.0.1" - web_socket_channel: - dependency: transitive - description: - name: web_socket_channel - sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 - url: "https://pub.dev" - source: hosted - version: "3.0.3" - webkit_inspection_protocol: - dependency: transitive - description: - name: webkit_inspection_protocol - sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" - url: "https://pub.dev" - source: hosted - version: "1.2.1" - yaml: - dependency: transitive - description: - name: yaml - sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce - url: "https://pub.dev" - source: hosted - version: "3.1.3" -sdks: - dart: ">=3.8.0 <4.0.0" diff --git a/packages/discord_gcp_alerts/pubspec.yaml b/packages/discord_gcp_alerts/pubspec.yaml index 0d27b599..5f7b711e 100644 --- a/packages/discord_gcp_alerts/pubspec.yaml +++ b/packages/discord_gcp_alerts/pubspec.yaml @@ -2,6 +2,7 @@ name: discord_gcp_alerts description: A server which proxies GCP Alert notifications to Discord. version: 1.0.0 publish_to: none +resolution: workspace environment: sdk: ">=3.8.0 <4.0.0" @@ -17,4 +18,3 @@ dev_dependencies: json_serializable: ^6.9.5 mocktail: ^1.0.4 test: ^1.25.15 - very_good_analysis: ^7.0.0 diff --git a/packages/jwt/analysis_options.yaml b/packages/jwt/analysis_options.yaml index 58a08d76..5879a7d4 100644 --- a/packages/jwt/analysis_options.yaml +++ b/packages/jwt/analysis_options.yaml @@ -1,3 +1,3 @@ -include: package:very_good_analysis/analysis_options.7.0.0.yaml +include: ../../analysis_options.yaml analyzer: exclude: ["example/**"] diff --git a/packages/jwt/pubspec.yaml b/packages/jwt/pubspec.yaml index bc5f924f..048349db 100644 --- a/packages/jwt/pubspec.yaml +++ b/packages/jwt/pubspec.yaml @@ -2,6 +2,7 @@ name: jwt description: A Dart Json Web Token Library version: 1.0.0+1 publish_to: none +resolution: workspace environment: sdk: ">=3.8.0 <4.0.0" @@ -21,4 +22,3 @@ dev_dependencies: json_serializable: ^6.1.4 path: ^1.9.0 test: ^1.19.2 - very_good_analysis: ^7.0.0 diff --git a/packages/redis_client/analysis_options.yaml b/packages/redis_client/analysis_options.yaml index 58a5c003..fac60e24 100644 --- a/packages/redis_client/analysis_options.yaml +++ b/packages/redis_client/analysis_options.yaml @@ -1,6 +1 @@ -include: package:very_good_analysis/analysis_options.7.0.0.yaml -linter: - rules: - # Disabling in favor of the new Dart 3.7 format. - # https://github.com/VeryGoodOpenSource/very_good_analysis/issues/136 - require_trailing_commas: false \ No newline at end of file +include: ../../analysis_options.yaml \ No newline at end of file diff --git a/packages/redis_client/pubspec.yaml b/packages/redis_client/pubspec.yaml index c43c640f..42d964c0 100644 --- a/packages/redis_client/pubspec.yaml +++ b/packages/redis_client/pubspec.yaml @@ -4,6 +4,7 @@ version: 0.0.7 homepage: https://shorebird.dev repository: https://github.com/shorebirdtech/shorebird/tree/main/packages/redis_client topics: [redis, cache, shorebird] +resolution: workspace environment: sdk: ">=3.8.0 <4.0.0" @@ -13,4 +14,3 @@ dependencies: dev_dependencies: test: ^1.19.2 - very_good_analysis: ^7.0.0 diff --git a/packages/scoped_deps/analysis_options.yaml b/packages/scoped_deps/analysis_options.yaml index 285a6ae8..5879a7d4 100644 --- a/packages/scoped_deps/analysis_options.yaml +++ b/packages/scoped_deps/analysis_options.yaml @@ -1,8 +1,3 @@ -include: package:very_good_analysis/analysis_options.7.0.0.yaml -linter: - rules: - # Disabling in favor of the new Dart 3.7 format. - # https://github.com/VeryGoodOpenSource/very_good_analysis/issues/136 - require_trailing_commas: false +include: ../../analysis_options.yaml analyzer: exclude: ["example/**"] diff --git a/packages/scoped_deps/pubspec.yaml b/packages/scoped_deps/pubspec.yaml index ff879514..33045fe6 100644 --- a/packages/scoped_deps/pubspec.yaml +++ b/packages/scoped_deps/pubspec.yaml @@ -3,6 +3,7 @@ description: A simple Dart library for managing scoped dependencies built on top version: 0.1.0+2 homepage: https://shorebird.dev repository: https://github.com/shorebirdtech/shorebird/tree/main/packages/scoped_deps +resolution: workspace environment: sdk: ">=3.8.0 <4.0.0" @@ -13,4 +14,3 @@ dependencies: dev_dependencies: mocktail: ^1.0.0 test: ^1.0.0 - very_good_analysis: ^7.0.0 diff --git a/packages/shorebird_cli/analysis_options.yaml b/packages/shorebird_cli/analysis_options.yaml index 3cd7edfd..4946c88a 100644 --- a/packages/shorebird_cli/analysis_options.yaml +++ b/packages/shorebird_cli/analysis_options.yaml @@ -1,13 +1,4 @@ -include: package:very_good_analysis/analysis_options.7.0.0.yaml -linter: - rules: - # Disabling in favor of the new Dart 3.7 format. - # https://github.com/VeryGoodOpenSource/very_good_analysis/issues/136 - require_trailing_commas: false - # Dart 3.7 format sometimes produces lines longer than 80 characters. - # https://github.com/dart-lang/sdk/issues/60173 - lines_longer_than_80_chars: false +include: ../../analysis_options.yaml analyzer: - exclude: - - lib/**.g.dart + exclude: - lib/src/version.dart diff --git a/packages/shorebird_cli/lib/src/artifact_builder/artifact_builder.dart b/packages/shorebird_cli/lib/src/artifact_builder/artifact_builder.dart index d8f4a458..5715568b 100644 --- a/packages/shorebird_cli/lib/src/artifact_builder/artifact_builder.dart +++ b/packages/shorebird_cli/lib/src/artifact_builder/artifact_builder.dart @@ -36,7 +36,8 @@ class ArtifactBuildException implements Exception { typedef ShorebirdBuildCommand = Future Function(); /// {@template apple_build_result} -/// Metadata about the result of a `flutter build` invocation for an apple target. +/// Metadata about the result of a `flutter build` invocation for an apple +/// target. /// {@endtemplate} class AppleBuildResult { /// {@macro apple_build_result} @@ -324,8 +325,8 @@ Reason: Exited with code $exitCode.''', String? base64PublicKey, }) async { final projectRoot = shorebirdEnv.getShorebirdProjectRoot()!; - // Delete the .dart_tool directory to ensure that the app is rebuilt. - // This is necessary because we always look for a recently modified app.dill. + // Delete the .dart_tool directory to ensure that the app is rebuilt. This + // is necessary because we always look for a recently modified app.dill. final dartToolDir = Directory(p.join(projectRoot.path, '.dart_tool')); if (dartToolDir.existsSync()) { dartToolDir.deleteSync(recursive: true); @@ -388,8 +389,8 @@ Reason: Exited with code $exitCode.''', String? base64PublicKey, }) async { final projectRoot = shorebirdEnv.getShorebirdProjectRoot()!; - // Delete the .dart_tool directory to ensure that the app is rebuilt. - // This is necessary because we always look for a recently modified app.dill. + // Delete the .dart_tool directory to ensure that the app is rebuilt. This + // is necessary because we always look for a recently modified app.dill. final dartToolDir = Directory(p.join(projectRoot.path, '.dart_tool')); if (dartToolDir.existsSync()) { dartToolDir.deleteSync(recursive: true); @@ -450,8 +451,8 @@ Reason: Exited with code $exitCode.''', String? base64PublicKey, }) async { final projectRoot = shorebirdEnv.getShorebirdProjectRoot()!; - // Delete the .dart_tool directory to ensure that the app is rebuilt. - // This is necessary because we always look for a recently modified app.dill. + // Delete the .dart_tool directory to ensure that the app is rebuilt. This + // is necessary because we always look for a recently modified app.dill. final dartToolDir = Directory(p.join(projectRoot.path, '.dart_tool')); if (dartToolDir.existsSync()) { dartToolDir.deleteSync(recursive: true); diff --git a/packages/shorebird_cli/lib/src/code_push_client_wrapper.dart b/packages/shorebird_cli/lib/src/code_push_client_wrapper.dart index 3cd54800..2cd81abf 100644 --- a/packages/shorebird_cli/lib/src/code_push_client_wrapper.dart +++ b/packages/shorebird_cli/lib/src/code_push_client_wrapper.dart @@ -948,9 +948,9 @@ aar artifact already exists, continuing...'''); } } - /// Publishes a patch to the Shorebird server. - /// This consists of creating a patch, uploading patch artifacts, and promoting - /// the patch to a specific channel based on the provided [track]. + /// Publishes a patch to the Shorebird server. This consists of creating a + /// patch, uploading patch artifacts, and promoting the patch to a specific + /// channel based on the provided [track]. Future publishPatch({ required String appId, required int releaseId, diff --git a/packages/shorebird_cli/lib/src/commands/flutter/config/flutter_config_command.dart b/packages/shorebird_cli/lib/src/commands/flutter/config/flutter_config_command.dart index ef2cdfd5..592fa163 100644 --- a/packages/shorebird_cli/lib/src/commands/flutter/config/flutter_config_command.dart +++ b/packages/shorebird_cli/lib/src/commands/flutter/config/flutter_config_command.dart @@ -10,7 +10,7 @@ import 'package:shorebird_cli/src/shorebird_process.dart'; class FlutterConfigCommand extends ShorebirdProxyCommand { @override String get description => - 'Configure Flutter settings. This proxies to the underlying `flutter config` command.'; + '''Configure Flutter settings. This proxies to the underlying `flutter config` command.'''; @override String get name => 'config'; diff --git a/packages/shorebird_cli/lib/src/commands/preview_command.dart b/packages/shorebird_cli/lib/src/commands/preview_command.dart index 4fac6d09..4169384d 100644 --- a/packages/shorebird_cli/lib/src/commands/preview_command.dart +++ b/packages/shorebird_cli/lib/src/commands/preview_command.dart @@ -90,7 +90,7 @@ This is only applicable when previewing Android releases.''', 'staging', negatable: false, help: - '[DEPRECATED] Preview the release on the staging environment. Use --track=staging instead.', + '''[DEPRECATED] Preview the release on the staging environment. Use --track=staging instead.''', hide: true, ) ..addOption( diff --git a/packages/shorebird_cli/lib/src/commands/release/release_command.dart b/packages/shorebird_cli/lib/src/commands/release/release_command.dart index 4c3f2778..5cee8a91 100644 --- a/packages/shorebird_cli/lib/src/commands/release/release_command.dart +++ b/packages/shorebird_cli/lib/src/commands/release/release_command.dart @@ -266,77 +266,80 @@ of the iOS app that is using this module. (aar and ios-framework only)''', final releaseFlutterShorebirdEnv = shorebirdEnv.copyWith( flutterRevisionOverride: targetFlutterRevision, ); - return await runScoped(() async { - await cache.updateAll(); + return await runScoped( + () async { + await cache.updateAll(); - final flutterVersionString = await shorebirdFlutter - .getVersionAndRevision(); - logger.info( - 'Building ${releaser.artifactDisplayName} with Flutter $flutterVersionString', - ); - final FileSystemEntity releaseArtifact; - try { - releaseArtifact = await releaser.buildReleaseArtifacts(); - } on ArtifactBuildException catch (e) { - logger.err(e.message); - if (!e.fixRecommendation.isNullOrEmpty) { - logger.info(e.fixRecommendation); + final flutterVersionString = await shorebirdFlutter + .getVersionAndRevision(); + logger.info( + '''Building ${releaser.artifactDisplayName} with Flutter $flutterVersionString''', + ); + final FileSystemEntity releaseArtifact; + try { + releaseArtifact = await releaser.buildReleaseArtifacts(); + } on ArtifactBuildException catch (e) { + logger.err(e.message); + if (!e.fixRecommendation.isNullOrEmpty) { + logger.info(e.fixRecommendation); + } + throw ProcessExit(ExitCode.software.code); + } on Exception catch (e) { + logger.err('Failed to build release artifacts: $e'); + throw ProcessExit(ExitCode.software.code); } - throw ProcessExit(ExitCode.software.code); - } on Exception catch (e) { - logger.err('Failed to build release artifacts: $e'); - throw ProcessExit(ExitCode.software.code); - } - final releaseVersion = await releaser.getReleaseVersion( - releaseArtifactRoot: releaseArtifact, - ); + final releaseVersion = await releaser.getReleaseVersion( + releaseArtifactRoot: releaseArtifact, + ); - // Ensure we can create a release from what we've built. - await ensureVersionIsReleasable( - version: releaseVersion, - flutterRevision: targetFlutterRevision, - releasePlatform: releaser.releaseType.releasePlatform, - ); + // Ensure we can create a release from what we've built. + await ensureVersionIsReleasable( + version: releaseVersion, + flutterRevision: targetFlutterRevision, + releasePlatform: releaser.releaseType.releasePlatform, + ); + + final dryRun = results['dry-run'] == true; + if (dryRun) { + logger + ..info('No issues detected.') + ..info('The server may enforce additional checks.'); + throw ProcessExit(ExitCode.success.code); + } + + // Ask the user to proceed (this is skipped when running via CI). + await confirmCreateRelease( + app: app, + releaseVersion: releaseVersion, + flutterVersion: targetFlutterRevision, + releasePlatform: releaser.releaseType.releasePlatform, + ); + + final release = await getOrCreateRelease( + version: releaseVersion, + releasePlatform: releaser.releaseType.releasePlatform, + ); + await prepareRelease(release: release, releaser: releaser); + await releaser.uploadReleaseArtifacts(release: release, appId: appId); + await finalizeRelease(release: release, releaser: releaser); - final dryRun = results['dry-run'] == true; - if (dryRun) { logger - ..info('No issues detected.') - ..info('The server may enforce additional checks.'); - throw ProcessExit(ExitCode.success.code); - } - - // Ask the user to proceed (this is skipped when running via CI). - await confirmCreateRelease( - app: app, - releaseVersion: releaseVersion, - flutterVersion: targetFlutterRevision, - releasePlatform: releaser.releaseType.releasePlatform, - ); - - final release = await getOrCreateRelease( - version: releaseVersion, - releasePlatform: releaser.releaseType.releasePlatform, - ); - await prepareRelease(release: release, releaser: releaser); - await releaser.uploadReleaseArtifacts(release: release, appId: appId); - await finalizeRelease(release: release, releaser: releaser); - - logger - ..success(''' + ..success(''' โœ… Published Release ${release.version}!''') - ..info(releaser.postReleaseInstructions); + ..info(releaser.postReleaseInstructions); - printPatchInstructions( - releaser: releaser, - releaseVersion: releaseVersion, - releaseType: releaser.releaseType, - flavor: flavor, - target: target, - ); - }, values: {shorebirdEnvRef.overrideWith(() => releaseFlutterShorebirdEnv)}); + printPatchInstructions( + releaser: releaser, + releaseVersion: releaseVersion, + releaseType: releaser.releaseType, + flavor: flavor, + target: target, + ); + }, + values: {shorebirdEnvRef.overrideWith(() => releaseFlutterShorebirdEnv)}, + ); } /// Validates arguments that are common to all release types. diff --git a/packages/shorebird_cli/lib/src/shorebird_process.dart b/packages/shorebird_cli/lib/src/shorebird_process.dart index b774bc80..8595a97d 100644 --- a/packages/shorebird_cli/lib/src/shorebird_process.dart +++ b/packages/shorebird_cli/lib/src/shorebird_process.dart @@ -28,7 +28,8 @@ class ShorebirdProcess { /// The underlying process wrapper. final ProcessWrapper processWrapper; - /// Starts a process, streams the output in real-time, and returns the exit code. + /// Starts a process, streams the output in real-time, and returns the exit + /// code. Future stream( String executable, List arguments, { @@ -193,8 +194,8 @@ class ShorebirdProcess { if (executable.isEmpty) return executable; if (!platform.isWindows) return executable; if (executable.contains(' ') && !executable.contains('"')) { - // Use quoted strings to indicate where the file name ends and the arguments begin; - // otherwise, the file name is ambiguous. + // Use quoted strings to indicate where the file name ends and the + // arguments begin; otherwise, the file name is ambiguous. return '"$executable"'; } return executable; diff --git a/packages/shorebird_cli/pubspec.lock b/packages/shorebird_cli/pubspec.lock deleted file mode 100644 index 7699d710..00000000 --- a/packages/shorebird_cli/pubspec.lock +++ /dev/null @@ -1,866 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - _fe_analyzer_shared: - dependency: transitive - description: - name: _fe_analyzer_shared - sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f - url: "https://pub.dev" - source: hosted - version: "82.0.0" - analyzer: - dependency: transitive - description: - name: analyzer - sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0" - url: "https://pub.dev" - source: hosted - version: "7.4.5" - archive: - dependency: "direct main" - description: - name: archive - sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd" - url: "https://pub.dev" - source: hosted - version: "4.0.7" - args: - dependency: "direct main" - description: - name: args - sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 - url: "https://pub.dev" - source: hosted - version: "2.7.0" - asn1lib: - dependency: transitive - description: - name: asn1lib - sha256: "0511d6be23b007e95105ae023db599aea731df604608978dada7f9faf2637623" - url: "https://pub.dev" - source: hosted - version: "1.6.4" - async: - dependency: transitive - description: - name: async - sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" - url: "https://pub.dev" - source: hosted - version: "2.13.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" - url: "https://pub.dev" - source: hosted - version: "2.1.2" - build: - dependency: transitive - description: - name: build - sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0 - url: "https://pub.dev" - source: hosted - version: "2.4.2" - build_config: - dependency: transitive - description: - name: build_config - sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" - url: "https://pub.dev" - source: hosted - version: "1.1.2" - build_daemon: - dependency: transitive - description: - name: build_daemon - sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa" - url: "https://pub.dev" - source: hosted - version: "4.0.4" - build_resolvers: - dependency: transitive - description: - name: build_resolvers - sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0 - url: "https://pub.dev" - source: hosted - version: "2.4.4" - build_runner: - dependency: "direct dev" - description: - name: build_runner - sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99" - url: "https://pub.dev" - source: hosted - version: "2.4.15" - build_runner_core: - dependency: transitive - description: - name: build_runner_core - sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021" - url: "https://pub.dev" - source: hosted - version: "8.0.0" - build_verify: - dependency: "direct dev" - description: - name: build_verify - sha256: abbb9b9eda076854ac1678d284c053a5ec608e64da741d0801f56d4bbea27e23 - url: "https://pub.dev" - source: hosted - version: "3.1.0" - build_version: - dependency: "direct dev" - description: - name: build_version - sha256: "4e8eafbf722eac3bd60c8d38f108c04bd69b80100f8792b32be3407725c7fa6a" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - built_collection: - dependency: transitive - description: - name: built_collection - sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" - url: "https://pub.dev" - source: hosted - version: "5.1.1" - built_value: - dependency: transitive - description: - name: built_value - sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4 - url: "https://pub.dev" - source: hosted - version: "8.9.5" - checked_yaml: - dependency: "direct main" - description: - name: checked_yaml - sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff - url: "https://pub.dev" - source: hosted - version: "2.0.3" - cli_completion: - dependency: "direct main" - description: - name: cli_completion - sha256: "72e8ccc4545f24efa7bbdf3bff7257dc9d62b072dee77513cc54295575bc9220" - url: "https://pub.dev" - source: hosted - version: "0.5.1" - cli_config: - dependency: transitive - description: - name: cli_config - sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec - url: "https://pub.dev" - source: hosted - version: "0.2.0" - cli_util: - dependency: "direct main" - description: - name: cli_util - sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c - url: "https://pub.dev" - source: hosted - version: "0.4.2" - clock: - dependency: "direct main" - description: - name: clock - sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b - url: "https://pub.dev" - source: hosted - version: "1.1.2" - code_builder: - dependency: transitive - description: - name: code_builder - sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" - url: "https://pub.dev" - source: hosted - version: "4.10.1" - collection: - dependency: "direct main" - description: - name: collection - sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" - url: "https://pub.dev" - source: hosted - version: "1.19.1" - convert: - dependency: transitive - description: - name: convert - sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 - url: "https://pub.dev" - source: hosted - version: "3.1.2" - coverage: - dependency: transitive - description: - name: coverage - sha256: "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d" - url: "https://pub.dev" - source: hosted - version: "1.13.1" - crypto: - dependency: "direct main" - description: - name: crypto - sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" - url: "https://pub.dev" - source: hosted - version: "3.0.6" - dart_style: - dependency: transitive - description: - name: dart_style - sha256: "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af" - url: "https://pub.dev" - source: hosted - version: "3.1.0" - decimal: - dependency: transitive - description: - name: decimal - sha256: "28239b8b929c1bd8618702e6dbc96e2618cf99770bbe9cb040d6cf56a11e4ec3" - url: "https://pub.dev" - source: hosted - version: "3.2.1" - equatable: - dependency: "direct main" - description: - name: equatable - sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7" - url: "https://pub.dev" - source: hosted - version: "2.0.7" - ffi: - dependency: transitive - description: - name: ffi - sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" - url: "https://pub.dev" - source: hosted - version: "2.1.4" - file: - dependency: transitive - description: - name: file - sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 - url: "https://pub.dev" - source: hosted - version: "7.0.1" - fixnum: - dependency: transitive - description: - name: fixnum - sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be - url: "https://pub.dev" - source: hosted - version: "1.1.1" - frontend_server_client: - dependency: transitive - description: - name: frontend_server_client - sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 - url: "https://pub.dev" - source: hosted - version: "4.0.0" - glob: - dependency: transitive - description: - name: glob - sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de - url: "https://pub.dev" - source: hosted - version: "2.1.3" - google_identity_services_web: - dependency: transitive - description: - name: google_identity_services_web - sha256: "5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454" - url: "https://pub.dev" - source: hosted - version: "0.3.3+1" - googleapis_auth: - dependency: "direct main" - description: - name: googleapis_auth - sha256: b81fe352cc4a330b3710d2b7ad258d9bcef6f909bb759b306bf42973a7d046db - url: "https://pub.dev" - source: hosted - version: "2.0.0" - graphs: - dependency: transitive - description: - name: graphs - sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" - url: "https://pub.dev" - source: hosted - version: "2.3.2" - http: - dependency: "direct main" - description: - name: http - sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b" - url: "https://pub.dev" - source: hosted - version: "1.4.0" - http_multi_server: - dependency: transitive - description: - name: http_multi_server - sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 - url: "https://pub.dev" - source: hosted - version: "3.2.2" - http_parser: - dependency: transitive - description: - name: http_parser - sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" - url: "https://pub.dev" - source: hosted - version: "4.1.2" - intl: - dependency: "direct main" - description: - name: intl - sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" - url: "https://pub.dev" - source: hosted - version: "0.20.2" - io: - dependency: "direct main" - description: - name: io - sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b - url: "https://pub.dev" - source: hosted - version: "1.0.5" - iregexp: - dependency: transitive - description: - name: iregexp - sha256: "143859dcaeecf6f683102786762d70a47ef8441a0d2287a158172d32d38799cf" - url: "https://pub.dev" - source: hosted - version: "0.1.2" - js: - dependency: transitive - description: - name: js - sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" - url: "https://pub.dev" - source: hosted - version: "0.7.2" - json_annotation: - dependency: "direct main" - description: - name: json_annotation - sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" - url: "https://pub.dev" - source: hosted - version: "4.9.0" - json_path: - dependency: "direct main" - description: - name: json_path - sha256: a3a06eb005f2e93d0df7f263cdf76bbd02c7602f5c4bed9be94fcca4c36be03e - url: "https://pub.dev" - source: hosted - version: "0.7.5" - json_serializable: - dependency: "direct dev" - description: - name: json_serializable - sha256: c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c - url: "https://pub.dev" - source: hosted - version: "6.9.5" - jwt: - dependency: "direct main" - description: - path: "../jwt" - relative: true - source: path - version: "1.0.0+1" - logging: - dependency: transitive - description: - name: logging - sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 - url: "https://pub.dev" - source: hosted - version: "1.3.0" - mason_logger: - dependency: "direct main" - description: - name: mason_logger - sha256: "6d5a989ff41157915cb5162ed6e41196d5e31b070d2f86e1c2edf216996a158c" - url: "https://pub.dev" - source: hosted - version: "0.3.3" - matcher: - dependency: transitive - description: - name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 - url: "https://pub.dev" - source: hosted - version: "0.12.17" - maybe_just_nothing: - dependency: transitive - description: - name: maybe_just_nothing - sha256: "0c06326e26d08f6ed43247404376366dc4d756cef23a4f1db765f546224c35e0" - url: "https://pub.dev" - source: hosted - version: "0.5.3" - meta: - dependency: "direct main" - description: - name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" - url: "https://pub.dev" - source: hosted - version: "1.17.0" - mime: - dependency: transitive - description: - name: mime - sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" - url: "https://pub.dev" - source: hosted - version: "2.0.0" - mocktail: - dependency: "direct dev" - description: - name: mocktail - sha256: "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8" - url: "https://pub.dev" - source: hosted - version: "1.0.4" - node_preamble: - dependency: transitive - description: - name: node_preamble - sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" - url: "https://pub.dev" - source: hosted - version: "2.0.2" - package_config: - dependency: transitive - description: - name: package_config - sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc - url: "https://pub.dev" - source: hosted - version: "2.2.0" - path: - dependency: "direct main" - description: - name: path - sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" - url: "https://pub.dev" - source: hosted - version: "1.9.1" - pem: - dependency: "direct main" - description: - name: pem - sha256: "3dfb24524f805ad694ba3cdbb6387ab31ab661fdb8ea873052ed88487fcfef86" - url: "https://pub.dev" - source: hosted - version: "2.0.5" - petitparser: - dependency: transitive - description: - name: petitparser - sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646" - url: "https://pub.dev" - source: hosted - version: "6.1.0" - platform: - dependency: "direct main" - description: - name: platform - sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" - url: "https://pub.dev" - source: hosted - version: "3.1.6" - pointycastle: - dependency: "direct main" - description: - name: pointycastle - sha256: "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5" - url: "https://pub.dev" - source: hosted - version: "4.0.0" - pool: - dependency: transitive - description: - name: pool - sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" - url: "https://pub.dev" - source: hosted - version: "1.5.1" - posix: - dependency: transitive - description: - name: posix - sha256: f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62 - url: "https://pub.dev" - source: hosted - version: "6.0.2" - propertylistserialization: - dependency: "direct main" - description: - name: propertylistserialization - sha256: "645aaac37e73735286087fc81b27c7eabaa81b6146881bdf84090ba56f4e15ad" - url: "https://pub.dev" - source: hosted - version: "1.4.1" - pub_semver: - dependency: "direct main" - description: - name: pub_semver - sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" - url: "https://pub.dev" - source: hosted - version: "2.2.0" - pubspec_parse: - dependency: "direct main" - description: - name: pubspec_parse - sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" - url: "https://pub.dev" - source: hosted - version: "1.5.0" - rational: - dependency: transitive - description: - name: rational - sha256: cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336 - url: "https://pub.dev" - source: hosted - version: "2.2.3" - retry: - dependency: "direct main" - description: - name: retry - sha256: "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc" - url: "https://pub.dev" - source: hosted - version: "3.1.2" - rfc_6901: - dependency: transitive - description: - name: rfc_6901 - sha256: df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - rsa_pkcs: - dependency: transitive - description: - name: rsa_pkcs - sha256: "6e1e03563d2cbd9758d8a562f738b759763d464fd65d32da132153230a0c0395" - url: "https://pub.dev" - source: hosted - version: "2.1.0" - scoped_deps: - dependency: "direct main" - description: - name: scoped_deps - sha256: bc54cece4fed785157dc53b7554d31107f574897f4b2d1196db905a38c084e31 - url: "https://pub.dev" - source: hosted - version: "0.1.0+2" - shelf: - dependency: transitive - description: - name: shelf - sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 - url: "https://pub.dev" - source: hosted - version: "1.4.2" - shelf_packages_handler: - dependency: transitive - description: - name: shelf_packages_handler - sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" - url: "https://pub.dev" - source: hosted - version: "3.0.2" - shelf_static: - dependency: transitive - description: - name: shelf_static - sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 - url: "https://pub.dev" - source: hosted - version: "1.1.3" - shelf_web_socket: - dependency: transitive - description: - name: shelf_web_socket - sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - shorebird_code_push_client: - dependency: "direct main" - description: - path: "../shorebird_code_push_client" - relative: true - source: path - version: "0.9.0+1" - shorebird_code_push_protocol: - dependency: "direct main" - description: - path: "../shorebird_code_push_protocol" - relative: true - source: path - version: "0.1.0+1" - source_gen: - dependency: transitive - description: - name: source_gen - sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b" - url: "https://pub.dev" - source: hosted - version: "2.0.0" - source_helper: - dependency: transitive - description: - name: source_helper - sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c" - url: "https://pub.dev" - source: hosted - version: "1.3.5" - source_map_stack_trace: - dependency: transitive - description: - name: source_map_stack_trace - sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b - url: "https://pub.dev" - source: hosted - version: "2.1.2" - source_maps: - dependency: transitive - description: - name: source_maps - sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812" - url: "https://pub.dev" - source: hosted - version: "0.10.13" - source_span: - dependency: transitive - description: - name: source_span - sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" - url: "https://pub.dev" - source: hosted - version: "1.10.1" - sprintf: - dependency: transitive - description: - name: sprintf - sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" - url: "https://pub.dev" - source: hosted - version: "7.0.0" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" - url: "https://pub.dev" - source: hosted - version: "1.12.1" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" - url: "https://pub.dev" - source: hosted - version: "2.1.4" - stream_transform: - dependency: "direct main" - description: - name: stream_transform - sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" - url: "https://pub.dev" - source: hosted - version: "1.4.1" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" - url: "https://pub.dev" - source: hosted - version: "1.2.2" - test: - dependency: "direct dev" - description: - name: test - sha256: "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb" - url: "https://pub.dev" - source: hosted - version: "1.26.2" - test_api: - dependency: transitive - description: - name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" - url: "https://pub.dev" - source: hosted - version: "0.7.6" - test_core: - dependency: transitive - description: - name: test_core - sha256: "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a" - url: "https://pub.dev" - source: hosted - version: "0.6.11" - timing: - dependency: transitive - description: - name: timing - sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" - url: "https://pub.dev" - source: hosted - version: "1.0.2" - ttl_cache: - dependency: transitive - description: - name: ttl_cache - sha256: "3c8d00de287cd646032af85411412becac3fd8889b12e5b07c9f8809e66cf132" - url: "https://pub.dev" - source: hosted - version: "0.3.0" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 - url: "https://pub.dev" - source: hosted - version: "1.4.0" - uuid: - dependency: "direct main" - description: - name: uuid - sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff - url: "https://pub.dev" - source: hosted - version: "4.5.1" - very_good_analysis: - dependency: "direct dev" - description: - name: very_good_analysis - sha256: "62d2b86d183fb81b2edc22913d9f155d26eb5cf3855173adb1f59fac85035c63" - url: "https://pub.dev" - source: hosted - version: "7.0.0" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: "6f82e9ee8e7339f5d8b699317f6f3afc17c80a68ebef1bc0d6f52a678c14b1e6" - url: "https://pub.dev" - source: hosted - version: "15.0.1" - watcher: - dependency: transitive - description: - name: watcher - sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" - url: "https://pub.dev" - source: hosted - version: "1.1.1" - web: - dependency: transitive - description: - name: web - sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" - url: "https://pub.dev" - source: hosted - version: "1.1.1" - web_socket: - dependency: transitive - description: - name: web_socket - sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" - url: "https://pub.dev" - source: hosted - version: "1.0.1" - web_socket_channel: - dependency: transitive - description: - name: web_socket_channel - sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 - url: "https://pub.dev" - source: hosted - version: "3.0.3" - webkit_inspection_protocol: - dependency: transitive - description: - name: webkit_inspection_protocol - sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" - url: "https://pub.dev" - source: hosted - version: "1.2.1" - win32: - dependency: transitive - description: - name: win32 - sha256: "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba" - url: "https://pub.dev" - source: hosted - version: "5.13.0" - xml: - dependency: "direct main" - description: - name: xml - sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 - url: "https://pub.dev" - source: hosted - version: "6.5.0" - yaml: - dependency: "direct main" - description: - name: yaml - sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce - url: "https://pub.dev" - source: hosted - version: "3.1.3" - yaml_edit: - dependency: "direct main" - description: - name: yaml_edit - sha256: fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5 - url: "https://pub.dev" - source: hosted - version: "2.2.2" -sdks: - dart: ">=3.8.0 <4.0.0" diff --git a/packages/shorebird_cli/pubspec.yaml b/packages/shorebird_cli/pubspec.yaml index d86219c0..151e92e0 100644 --- a/packages/shorebird_cli/pubspec.yaml +++ b/packages/shorebird_cli/pubspec.yaml @@ -2,6 +2,7 @@ name: shorebird_cli description: Command-line tool to interact with Shorebird's services. version: 1.6.41 repository: https://github.com/shorebirdtech/shorebird +resolution: workspace publish_to: none @@ -26,7 +27,7 @@ dependencies: json_path: ^0.7.5 jwt: path: ../jwt - mason_logger: ^0.3.3 + mason_logger: ^0.3.0 meta: ^1.16.0 path: ^1.9.1 pem: ^2.0.5 @@ -54,7 +55,6 @@ dev_dependencies: json_serializable: ^6.9.5 mocktail: ^1.0.3 test: ^1.26.0 - very_good_analysis: ^7.0.0 executables: shorebird: diff --git a/packages/shorebird_cli/test/src/commands/flutter/config/flutter_config_command_test.dart b/packages/shorebird_cli/test/src/commands/flutter/config/flutter_config_command_test.dart index 6d491792..29da6262 100644 --- a/packages/shorebird_cli/test/src/commands/flutter/config/flutter_config_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/flutter/config/flutter_config_command_test.dart @@ -30,7 +30,7 @@ void main() { expect( command.description, equals( - 'Configure Flutter settings. This proxies to the underlying `flutter config` command.', + '''Configure Flutter settings. This proxies to the underlying `flutter config` command.''', ), ); }); diff --git a/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart b/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart index 4d52fd83..37bb8307 100644 --- a/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart +++ b/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart @@ -309,7 +309,8 @@ void main() { }); test( - 'encodes the patch signing public key and forward it to buildIosFramework', + 'encodes the patch signing public key and ' + 'forward it to buildIosFramework', () async { await runWithOverrides( () => iosFrameworkReleaser.buildReleaseArtifacts(), diff --git a/packages/shorebird_cli/test/src/platform/apple_test.dart b/packages/shorebird_cli/test/src/platform/apple_test.dart index c1e1d4ce..e68a9cad 100644 --- a/packages/shorebird_cli/test/src/platform/apple_test.dart +++ b/packages/shorebird_cli/test/src/platform/apple_test.dart @@ -169,7 +169,7 @@ To add macOS, run "flutter create . --platforms macos"'''); ); verify( () => logger.detail( - 'Copying supplement file $classTableFilePath to ${releaseSnapshotDir.path}', + '''Copying supplement file $classTableFilePath to ${releaseSnapshotDir.path}''', ), ).called(1); // Logs about missing files diff --git a/packages/shorebird_cli/test/src/shorebird_android_artifacts_test.dart b/packages/shorebird_cli/test/src/shorebird_android_artifacts_test.dart index 402a5942..c11a314e 100644 --- a/packages/shorebird_cli/test/src/shorebird_android_artifacts_test.dart +++ b/packages/shorebird_cli/test/src/shorebird_android_artifacts_test.dart @@ -510,7 +510,7 @@ void main() { () => shorebirdAndroidArtifacts.extractAar( packageName: packageName, buildNumber: buildNumber, - unzipFn: (_, __) async {}, + unzipFn: (_, _) async {}, ), ); diff --git a/packages/shorebird_cli/test/src/shorebird_validator_test.dart b/packages/shorebird_cli/test/src/shorebird_validator_test.dart index dd4984a0..e77b3b38 100644 --- a/packages/shorebird_cli/test/src/shorebird_validator_test.dart +++ b/packages/shorebird_cli/test/src/shorebird_validator_test.dart @@ -128,7 +128,8 @@ void main() { ); }); - group("when pubspec.yaml doesn't contain shorebird.yaml as an asset", () { + group("when pubspec.yaml doesn't contain " + 'shorebird.yaml as an asset', () { setUp(() { when(() => shorebirdEnv.hasShorebirdYaml).thenReturn(true); when( diff --git a/packages/shorebird_cli/test/src/validators/macos_network_entitlement_validator_test.dart b/packages/shorebird_cli/test/src/validators/macos_network_entitlement_validator_test.dart index 172eac62..0e42714a 100644 --- a/packages/shorebird_cli/test/src/validators/macos_network_entitlement_validator_test.dart +++ b/packages/shorebird_cli/test/src/validators/macos_network_entitlement_validator_test.dart @@ -175,6 +175,8 @@ void main() { ); expect(unsignedMemoryIssue.fix, isNotNull); expect( + // This is just a very long method name. + // ignore: lines_longer_than_80_chars MacosEntitlementsValidator.hasAllowUnsignedExecutableMemoryEntitlement( plistFile: releaseEntitlementsFile(), ), @@ -182,6 +184,8 @@ void main() { ); runWithOverrides(() => unsignedMemoryIssue.fix!()); expect( + // This is just a very long method name. + // ignore: lines_longer_than_80_chars MacosEntitlementsValidator.hasAllowUnsignedExecutableMemoryEntitlement( plistFile: releaseEntitlementsFile(), ), diff --git a/packages/shorebird_code_push_client/analysis_options.yaml b/packages/shorebird_code_push_client/analysis_options.yaml index ce918e9e..f400e741 100644 --- a/packages/shorebird_code_push_client/analysis_options.yaml +++ b/packages/shorebird_code_push_client/analysis_options.yaml @@ -1,4 +1,4 @@ -include: package:very_good_analysis/analysis_options.7.0.0.yaml +include: ../../analysis_options.yaml analyzer: exclude: - lib/src/version.dart diff --git a/packages/shorebird_code_push_client/pubspec.yaml b/packages/shorebird_code_push_client/pubspec.yaml index e17fb6f9..9faa5322 100644 --- a/packages/shorebird_code_push_client/pubspec.yaml +++ b/packages/shorebird_code_push_client/pubspec.yaml @@ -2,6 +2,7 @@ name: shorebird_code_push_client description: Library which allows Dart applications to interact with the Shorebird CodePush API version: 0.9.0+1 repository: https://github.com/shorebirdtech/shorebird +resolution: workspace publish_to: none @@ -21,4 +22,3 @@ dev_dependencies: build_version: ^2.0.0 mocktail: ^1.0.0 test: ^1.19.2 - very_good_analysis: ^8.0.0 diff --git a/packages/shorebird_code_push_protocol/analysis_options.yaml b/packages/shorebird_code_push_protocol/analysis_options.yaml index aac47d51..d1c3fd35 100644 --- a/packages/shorebird_code_push_protocol/analysis_options.yaml +++ b/packages/shorebird_code_push_protocol/analysis_options.yaml @@ -1,5 +1,4 @@ -include: package:very_good_analysis/analysis_options.7.0.0.yaml +include: ../../analysis_options.yaml analyzer: exclude: - build/** - - lib/**.g.dart diff --git a/packages/shorebird_code_push_protocol/pubspec.yaml b/packages/shorebird_code_push_protocol/pubspec.yaml index 3319d6ae..164ffb1f 100644 --- a/packages/shorebird_code_push_protocol/pubspec.yaml +++ b/packages/shorebird_code_push_protocol/pubspec.yaml @@ -2,6 +2,7 @@ name: shorebird_code_push_protocol description: Library which contains common interfaces used by Shorebird CodePush version: 0.1.0+1 repository: https://github.com/shorebirdtech/shorebird +resolution: workspace publish_to: none @@ -19,4 +20,3 @@ dev_dependencies: json_serializable: ^6.6.1 mocktail: ^1.0.0 test: ^1.19.2 - very_good_analysis: ^7.0.0 diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 00000000..6d8d1197 --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,16 @@ +name: _ +publish_to: none +environment: + sdk: ^3.8.0 +workspace: + - packages/artifact_proxy + - packages/discord_gcp_alerts + - packages/jwt + - packages/redis_client + - packages/scoped_deps + - packages/shorebird_cli + - packages/shorebird_code_push_client + - packages/shorebird_code_push_protocol + +dev_dependencies: + very_good_analysis: ^8.0.0