Skip to content

Commit

Permalink
Merge branch 'main' into bo/macos
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanoltman committed Dec 2, 2024
2 parents 3aee1a1 + 8fdf607 commit f614b30
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 26 deletions.
37 changes: 25 additions & 12 deletions packages/artifact_proxy/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77"
url: "https://pub.dev"
source: hosted
version: "67.0.0"
version: "73.0.0"
_macros:
dependency: transitive
description: dart
source: sdk
version: "0.3.2"
analyzer:
dependency: transitive
description:
name: analyzer
sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a"
url: "https://pub.dev"
source: hosted
version: "6.4.1"
version: "6.8.0"
args:
dependency: transitive
description:
Expand Down Expand Up @@ -261,10 +266,10 @@ packages:
dependency: "direct dev"
description:
name: json_serializable
sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c
url: "https://pub.dev"
source: hosted
version: "6.8.0"
version: "6.9.0"
logging:
dependency: transitive
description:
Expand All @@ -273,6 +278,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.2.0"
macros:
dependency: transitive
description:
name: macros
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
url: "https://pub.dev"
source: hosted
version: "0.1.2-main.4"
matcher:
dependency: transitive
description:
Expand Down Expand Up @@ -485,26 +498,26 @@ packages:
dependency: "direct dev"
description:
name: test
sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
sha256: f2a018e2baa6fce7c8daa55b8bdf4b3d7d165f82caac269e4cbe5edd666c0e4c
url: "https://pub.dev"
source: hosted
version: "1.25.8"
version: "1.25.9"
test_api:
dependency: transitive
description:
name: test_api
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
url: "https://pub.dev"
source: hosted
version: "0.7.3"
version: "0.7.4"
test_core:
dependency: transitive
description:
name: test_core
sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
sha256: "60ff490bb383858015df7b7a0d883301a426edf9033989f55f091d91efb9dfaf"
url: "https://pub.dev"
source: hosted
version: "0.6.5"
version: "0.6.6"
timing:
dependency: transitive
description:
Expand Down
4 changes: 2 additions & 2 deletions packages/artifact_proxy/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:

dev_dependencies:
build_runner: ^2.4.13
json_serializable: ^6.6.1
json_serializable: ^6.9.0
mocktail: ^1.0.4
test: ^1.25.8
test: ^1.25.9
very_good_analysis: ^6.0.0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions packages/shorebird_cli/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,10 @@ packages:
dependency: "direct main"
description:
name: intl
sha256: "99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685"
sha256: "00f33b908655e606b86d2ade4710a231b802eec6f11e87e4ea3783fd72077a50"
url: "https://pub.dev"
source: hosted
version: "0.20.0"
version: "0.20.1"
io:
dependency: "direct main"
description:
Expand Down Expand Up @@ -743,26 +743,26 @@ packages:
dependency: "direct dev"
description:
name: test
sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
sha256: f2a018e2baa6fce7c8daa55b8bdf4b3d7d165f82caac269e4cbe5edd666c0e4c
url: "https://pub.dev"
source: hosted
version: "1.25.8"
version: "1.25.9"
test_api:
dependency: transitive
description:
name: test_api
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
url: "https://pub.dev"
source: hosted
version: "0.7.3"
version: "0.7.4"
test_core:
dependency: transitive
description:
name: test_core
sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
sha256: "60ff490bb383858015df7b7a0d883301a426edf9033989f55f091d91efb9dfaf"
url: "https://pub.dev"
source: hosted
version: "0.6.5"
version: "0.6.6"
timing:
dependency: transitive
description:
Expand Down Expand Up @@ -823,10 +823,10 @@ packages:
dependency: transitive
description:
name: web
sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
url: "https://pub.dev"
source: hosted
version: "0.5.1"
version: "1.1.0"
web_socket:
dependency: transitive
description:
Expand Down
4 changes: 2 additions & 2 deletions packages/shorebird_cli/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
equatable: ^2.0.7
googleapis_auth: ^1.6.0
http: ^1.2.1
intl: ^0.20.0
intl: ^0.20.1
io: ^1.0.4
json_annotation: ^4.9.0
json_path: ^0.7.1
Expand Down Expand Up @@ -54,7 +54,7 @@ dev_dependencies:
build_version: ^2.1.1
json_serializable: ^6.9.0
mocktail: ^1.0.3
test: ^1.25.8
test: ^1.25.9
very_good_analysis: ^6.0.0

executables:
Expand Down

0 comments on commit f614b30

Please sign in to comment.