luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Fix SIP-51 message 

**Problem**
The error message uses name, which may not match the actual project id
that the user can type into the shell.

**Solution**
Use displayBuildRelative to calculate the proper subproject id.
This commit is contained in:
Eugene Yokota 2025-03-16 14:58:23 -04:00
parent 9c08aea5fc
commit bd7bf73de5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/scala/sbt/Defaults.scala
View File

@ -1213,7 +1213,7 @@ object Defaults extends BuildCommon {
for (lib <- scalaDeps.take(1)) { for (lib <- scalaDeps.take(1)) {
val libVer = lib.module.revision val libVer = lib.module.revision
val libName = lib.module.name val libName = lib.module.name
val n = name.value val proj = Def.displayBuildRelative(thisProjectRef.value.build, thisProjectRef.value)
if (VersionNumber(sv).matchesSemVer(SemanticSelector(s"<$libVer"))) { if (VersionNumber(sv).matchesSemVer(SemanticSelector(s"<$libVer"))) {
val err = !allowUnsafeScalaLibUpgrade.value val err = !allowUnsafeScalaLibUpgrade.value
val fix = val fix =
@ -1227,13 +1227,13 @@ object Defaults extends BuildCommon {
|Compilation (macro expansion) or using the Scala REPL in sbt may fail with a LinkageError.""".stripMargin |Compilation (macro expansion) or using the Scala REPL in sbt may fail with a LinkageError.""".stripMargin
val msg = val msg =
s"""Expected `$n/scalaVersion` to be $libVer or later, but found $sv. s"""Expected `$proj scalaVersion` to be $libVer or later, but found $sv.
|To support backwards-only binary compatibility (SIP-51), the Scala 2.13 compiler |To support backwards-only binary compatibility (SIP-51), the Scala 2.13 compiler
|should not be older than $libName on the dependency classpath. |should not be older than $libName on the dependency classpath.
| |
|$fix |$fix
| |
|See `$n/evicted` to know why $libName $libVer is getting pulled in. |See `$proj evicted` to know why $libName $libVer is getting pulled in.
|""".stripMargin |""".stripMargin
if (err) sys.error(msg) if (err) sys.error(msg)
else s.log.warn(msg) else s.log.warn(msg)