Skip to content
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
15 changes: 8 additions & 7 deletions zorphy/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,18 @@ packages:
dependency: transitive
description:
name: built_collection
sha256: "44922ecebd8e3d0cef743dadd3b54df4e87e2a4c52a29465a1872aa9e192caa8"
sha256: "68c430bce63c47a00d7c978545777d2f6315bb1dbbb098d4f60cfd3148b8bc61"
url: "https://pub.dev"
source: hosted
version: "5.1.2"
version: "6.0.0"
built_value:
dependency: transitive
dependency: "direct overridden"
description:
name: built_value
sha256: f87ea98192116f7093cb214551ce1929caae0681fdba282b3d8b4462adee7bb7
url: "https://pub.dev"
source: hosted
path: built_value
ref: widen-built-collection-1405
resolved-ref: afeb2eb4d825f54c6f1b7666c88ad138ad1b392f
url: "https://github.com/arrrrny/built_value.dart"
source: git
version: "8.13.0"
characters:
dependency: transitive
Expand Down
14 changes: 7 additions & 7 deletions zorphy/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ dependencies:
quiver: ^3.2.2
path: ^1.9.1
collection: ^1.19.1
# `built_collection` 5.1.2 -> 6.0.0 is held, and NOT by this constraint:
# code_builder 4.13.0 and build_daemon 4.1.7 already allow >=5.1.1 <7.0.0, so
# waiting on code_builder upstream would never release it. The sole blocker is
# built_value 8.13.0 (`built_collection: ^5.0.0`), reached here via
# code_builder/build_runner/build_daemon. Decision (issue #158): wait for
# built_value to widen rather than pin 6.x, which would make the graph
# unsatisfiable. Tracking: google/built_value.dart#1405.
# `built_collection` 6.0.0 is reached through a development-only git override
# on `built_value`, because 8.13.0 still pins `^5.0.0` and is the sole
# blocker: code_builder 4.13.0, build_runner 2.17.1 and build_daemon 4.1.7 all
# already allow >=5.1.1 <7.0.0, so waiting on code_builder would never release
# it. The widening is proposed in google/built_value.dart#1406; drop the
# `built_value` block from pubspec_overrides.yaml once a release carries it.
# Nothing here changes for consumers — pub ignores that file.
code_builder: ^4.10.0
dart_style: ^3.1.1
args: ^2.6.0
Expand Down
10 changes: 10 additions & 0 deletions zorphy/pubspec_overrides.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
dependency_overrides:
zorphy_annotation:
path: ../zorphy_annotation
# built_value 8.13.0 still pins built_collection ^5.0.0, which is the sole
# blocker for 6.0.0 (google/built_value.dart#1405). The widening is in

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Nit (📐 clarity): here it reads "The widening is in google/built_value.dart#1406" (present tense, as if already merged), while pubspec.yaml correctly says "is proposed in". The branch itself says "Fixes #1405" and the PR is #1406. Consider e.g. "proposed in #1406 (branch widen-built-collection-1405, fixes #1405)" to keep the cross-references unambiguous.

# google/built_value.dart#1406; until a release carries it, resolve against
# that branch so CI exercises the 6.0.0 graph. Development-only: pub ignores
# this file, so consumers still resolve whatever built_value allows.
built_value:
git:
url: https://github.com/arrrrny/built_value.dart
ref: widen-built-collection-1405

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Non-blocking (📐 maintainability): ref is a mutable branch name in a personal fork, so CI now fetches arrrrny/built_value.dart at build time, and a dart pub upgrade (or a deleted lock) re-resolves the branch head. The committed resolved-ref: afeb2eb… keeps pub get reproducible, so this is fine for a development-only gate — just note the override's stability depends on that fork/branch staying put. Deleting this block once built_value publishes the widening (as the comment says) closes it.

path: built_value
Loading