Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update builder packages, increment sass version #2537

Merged
merged 4 commits into from
May 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ analyzer:
language:
strict-casts: true
strict-inference: true
strict-raw-types: true
# re-enable when this issue is fixed:
# https://github.com/google/json_serializable.dart/issues/1324
strict-raw-types: false
exclude:
- "build/**"
- "doc/api/**"
Expand Down
5 changes: 2 additions & 3 deletions lib/workshops/src/meta.g.dart

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

56 changes: 28 additions & 28 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: "405666cd3cf0ee0a48d21ec67e65406aad2c726d9fa58840d3375e7bdcd32a07"
sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
url: "https://pub.dev"
source: hosted
version: "60.0.0"
version: "61.0.0"
analyzer:
dependency: transitive
description:
name: analyzer
sha256: "1952250bd005bacb895a01bf1b4dc00e3ba1c526cf47dca54dfe24979c65f5b3"
sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
url: "https://pub.dev"
source: hosted
version: "5.12.0"
version: "5.13.0"
archive:
dependency: transitive
description:
Expand Down Expand Up @@ -149,10 +149,10 @@ packages:
dependency: transitive
description:
name: built_value
sha256: "2f17434bd5d52a26762043d6b43bb53b3acd029b4d9071a329f46d67ef297e6d"
sha256: "7dd62d9faf105c434f3d829bbe9c4be02ec67f5ed94832222116122df67c5452"
url: "https://pub.dev"
source: hosted
version: "8.5.0"
version: "8.6.0"
charcode:
dependency: transitive
description:
Expand Down Expand Up @@ -245,10 +245,10 @@ packages:
dependency: transitive
description:
name: csslib
sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745
sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f"
url: "https://pub.dev"
source: hosted
version: "0.17.2"
version: "0.17.3"
dart_flutter_team_lints:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -277,10 +277,10 @@ packages:
dependency: transitive
description:
name: file
sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
url: "https://pub.dev"
source: hosted
version: "6.1.4"
version: "7.0.0"
fixnum:
dependency: transitive
description:
Expand Down Expand Up @@ -309,18 +309,18 @@ packages:
dependency: "direct dev"
description:
name: git
sha256: "840c57646dd22c63b3305a8ef962215f0e9e9a9ba2876e6632083026b8c65f43"
sha256: "1982737427ef1ef2bb69027ea0234469774495e86afe202de81ee46d37364e55"
url: "https://pub.dev"
source: hosted
version: "2.2.0"
version: "2.2.1"
glob:
dependency: transitive
description:
name: glob
sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c"
sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
graphs:
dependency: transitive
description:
Expand Down Expand Up @@ -405,10 +405,10 @@ packages:
dependency: "direct dev"
description:
name: json_serializable
sha256: "43793352f90efa5d8b251893a63d767b2f7c833120e3cc02adad55eefec04dc7"
sha256: "61a60716544392a82726dd0fa1dd6f5f1fd32aec66422b6e229e7b90d52325c4"
url: "https://pub.dev"
source: hosted
version: "6.6.2"
version: "6.7.0"
lints:
dependency: transitive
description:
Expand Down Expand Up @@ -437,10 +437,10 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev"
source: hosted
version: "0.12.15"
version: "0.12.16"
mdc_web:
dependency: "direct main"
description:
Expand Down Expand Up @@ -541,18 +541,18 @@ packages:
dependency: "direct overridden"
description:
name: sass
sha256: "4b1777bdc5466f3dae1874bd0523e761d38e80c21ca68b3c70a7310d9419b14b"
sha256: cb18c7093e4e6ebabba6efbcbb9926238ca9932e3bf6c553dc811a89e1524b28
url: "https://pub.dev"
source: hosted
version: "1.32.10"
version: "1.62.1"
sass_builder:
dependency: "direct main"
description:
name: sass_builder
sha256: "3304e9eaa9e10ad8c9302d46ba72e71209dcf09bfd81124d7a837fbcf5f75654"
sha256: "8f714e91a19272b7f0b68a5a100c8c000f3101731288376fdcbfb0e464274eb5"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.2.1"
scratch_space:
dependency: transitive
description:
Expand Down Expand Up @@ -692,26 +692,26 @@ packages:
dependency: "direct dev"
description:
name: test
sha256: "4f92f103ef63b1bbac6f4bd1930624fca81b2574464482512c4f0896319be575"
sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46"
url: "https://pub.dev"
source: hosted
version: "1.24.2"
version: "1.24.3"
test_api:
dependency: transitive
description:
name: test_api
sha256: daadc9baabec998b062c9091525aa95786508b1c48e9c30f1f891b8bf6ff2e64
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
url: "https://pub.dev"
source: hosted
version: "0.5.2"
version: "0.6.0"
test_core:
dependency: transitive
description:
name: test_core
sha256: "3642b184882f79e76ca57a9230fb971e494c3c1fd09c21ae3083ce891bcc0aa1"
sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e"
url: "https://pub.dev"
source: hosted
version: "0.5.2"
version: "0.5.3"
timing:
dependency: transitive
description:
Expand Down
18 changes: 10 additions & 8 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ dependencies:
path: ^1.8.0
protobuf: ^2.1.0
pub_semver: ^2.1.0
# ^2.1.5 is no longer compatible with our overridden sass version
# https://github.com/dart-lang/dart-pad/issues/2388
sass_builder: 2.1.4
sass_builder: ^2.2.1
shelf: ^1.3.0
shelf_static: ^1.1.0
split:
Expand All @@ -40,14 +38,18 @@ dev_dependencies:
dart_flutter_team_lints: ^1.0.0
git: ^2.0.0
grinder: ^0.9.4
json_serializable: ^6.6.1
json_serializable: ^6.7.0
test: ^1.21.1
webdriver: ^3.0.2

# waiting for the next material-components-web release.
# Once released, it will need to be rolled into package:mdc_web.
#
# package:mdc_web needs to upgrade the version of material-components-web 12.0.0
# or above, which includes this fix for the division operator:
# https://github.com/material-components/material-components-web/pull/7158
#
# Until then, dart-sass produces a warning that this operator is being removed
# in favor of calc().
#
# See this issue for details:
# https://github.com/dart-lang/dart-pad/issues/2388
dependency_overrides:
sass: 1.32.10
sass: ^1.62.0