Skip to content

Commit eb1c818

Browse files
committed
deps: Add some overrides to unblock Flutter Color API changes for wide-gamut
This commit follows the request in flutter/flutter#154123 by pointing to a Flutter maintainer's fork of `flutter_color_model` and `color_model` while we wait for their PR from that fork to be settled. To validate this change, I checked out the roll from engine-flutter-autoroll that failed on our tests: flutter/flutter#153985 and confirmed that our tests (the ones that run with `tools/check test --all`) failed with same-looking errors before this change and passed after this change. I did run all of `tools/check --all`, not just the `test` suite. There was "info"-level output from the analyzer telling us about things we've been using that will be deprecated with the proposed Color API change (`Color.value` and `Color.withOpacity`). We'll want to respond promptly to these deprecation notices -- and in fact our CI treats this "info"-level output as an error -- but I think we can leave that out of scope for the customer-tests fix, because we've set it so "info"-level analyzer output isn't fatal there: flutter/tests@54cc35f9f#diff-d2bef7bb93d58c3db877456685dad3e25d1546c1fc318e9d6c560e91c457eaa7R10
1 parent e91694f commit eb1c818

File tree

2 files changed

+28
-10
lines changed

2 files changed

+28
-10
lines changed

pubspec.lock

+12-10
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,13 @@ packages:
199199
source: hosted
200200
version: "1.19.0"
201201
color_models:
202-
dependency: transitive
202+
dependency: "direct overridden"
203203
description:
204-
name: color_models
205-
sha256: "3683f0a461570161ca22b7d3e1765b2ce2bce3534db14e00d5ee458d0287abac"
206-
url: "https://pub.dev"
207-
source: hosted
204+
path: color_models
205+
ref: wide-gamut
206+
resolved-ref: "27298bc2cbfc9f1da08503be68da472076bcb61c"
207+
url: "https://github.com/gaaclarke/color_models.git"
208+
source: git
208209
version: "1.3.3"
209210
convert:
210211
dependency: "direct main"
@@ -422,11 +423,12 @@ packages:
422423
flutter_color_models:
423424
dependency: "direct main"
424425
description:
425-
name: flutter_color_models
426-
sha256: "8454198ba9a82e533452d0764f1df3d6c3ccc2b33e18eb1f2fedc7ae4a5c43be"
427-
url: "https://pub.dev"
428-
source: hosted
429-
version: "1.3.3+2"
426+
path: flutter_color_models
427+
ref: wide-gamut
428+
resolved-ref: "27298bc2cbfc9f1da08503be68da472076bcb61c"
429+
url: "https://github.com/gaaclarke/color_models.git"
430+
source: git
431+
version: "1.4.0"
430432
flutter_driver:
431433
dependency: "direct dev"
432434
description: flutter

pubspec.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,22 @@ dependencies:
6767
path: ./packages/zulip_plugin
6868
# Keep list sorted when adding dependencies; it helps prevent merge conflicts.
6969

70+
dependency_overrides:
71+
# TODO(#918) remove this and `flutter_color_models` when `flutter_color_models` accommodates
72+
# wide-gamut adjustments to Flutter's `Color`. A PR to `flutter_color_models` is already open:
73+
# https://github.com/james-alex/color_models/pull/10
74+
color_models:
75+
git:
76+
url: https://github.com/gaaclarke/color_models.git
77+
ref: wide-gamut
78+
path: color_models
79+
flutter_color_models:
80+
git:
81+
url: https://github.com/gaaclarke/color_models.git
82+
ref: wide-gamut
83+
path: flutter_color_models
84+
85+
7086
dev_dependencies:
7187
flutter_driver:
7288
sdk: flutter

0 commit comments

Comments
 (0)