Skip to content

Commit

Permalink
VersionRange: Always output minor version for ~> and ^
Browse files Browse the repository at this point in the history
Dub was correct in outputting only the major version,
however this can lead to some confusion for users
as pointed out in 2801. Accepting ~>5 but only exposing
two states (~>5.0 and ~>5.0.0) will hopefully make
things a bit more obvious.
  • Loading branch information
Geod24 committed Jun 11, 2024
1 parent 95e2ba6 commit b565193
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions source/dub/dependency.d
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,10 @@ unittest {
unittest {
assert(VersionRange.fromString("~>1.0.4").toString() == "~>1.0.4");
assert(VersionRange.fromString("~>1.4").toString() == "~>1.4");
assert(VersionRange.fromString("~>2").toString() == "~>2");
// https://github.com/dlang/dub/issues/2830
assert(VersionRange.fromString("~>2").toString() == "~>2.0");
assert(VersionRange.fromString("~>5.0").toString() == "~>5.0");

assert(VersionRange.fromString("~>1.0.4+1.2.3").toString() == "~>1.0.4");
assert(VersionRange.fromString("^0.1.2").toString() == "^0.1.2");
assert(VersionRange.fromString("^1.2.3").toString() == "^1.2.3");
Expand Down Expand Up @@ -1132,7 +1135,10 @@ public struct VersionRange
auto parts = va.splitter('.').array;
assert(parts.length == 3, "Version string with a digit group count != 3: "~va);

foreach (i; 0 .. 3) {
// Start at 1 because the notation `~>1` and `^1` are equivalent
// to `~>1.0` and `^1.0`, and the latter are better understood
// and recognized by users. See for example issue 2830.
foreach (i; 1 .. 3) {
auto vp = parts[0 .. i+1].join(".");
auto ve = Version(expandVersion(vp));
auto veb = Version(bumpVersion(vp) ~ "-0");
Expand Down

0 comments on commit b565193

Please sign in to comment.