diff --git a/runner/src/mill/runner/MillIvy.scala b/runner/src/mill/runner/MillIvy.scala index 73c78943761..d4e0bd391c4 100644 --- a/runner/src/mill/runner/MillIvy.scala +++ b/runner/src/mill/runner/MillIvy.scala @@ -2,24 +2,18 @@ package mill.runner object MillIvy { def processMillIvyDepSignature(signatures: Set[String]): Set[String] = { - // replace platform notation and empty version - val millSigs: Set[String] = for (signature <- signatures) yield { - - if (signature.endsWith(":") && signature.count(_ == ":") == 4) signature + "$MILL_VERSION" - // else - signature.split("[:]") match { - case Array(org, "", pname, "", version) - if org.length > 0 && pname.length > 0 && version.length > 0 => - s"${org}::${pname}_mill$$MILL_BIN_PLATFORM:${version}" - case Array(org, "", "", pname, "", version) - if org.length > 0 && pname.length > 0 && version.length > 0 => - s"${org}:::${pname}_mill$$MILL_BIN_PLATFORM:${version}" - case Array(org, "", name) if org.length > 0 && name.length > 0 && signature.endsWith(":") => - s"${org}::${name}:$$MILL_VERSION" - case _ => signature + val millSigs: Set[String] = + for (signature <- signatures) yield { + signature.split("[:]") match { + case Array(org, "", name) + if org.length > 0 && name.length > 0 && signature.endsWith(":") => + // replace empty version with Mill Version Placeholder + signature + "$MILL_VERSION" + case _ => signature + } } - } + // replace special MILL_ placeholders val replaced = millSigs.map(_ .replace("$MILL_VERSION", mill.main.BuildInfo.millVersion) .replace("${MILL_VERSION}", mill.main.BuildInfo.millVersion)