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

Merge pull request #6422 from smarter/fix-sandwich 

Fix Scala 2.13-3.0 sandwich on Scala >= 3.0.0
This commit is contained in:
eugene yokota 2021-03-31 19:11:33 -04:00 committed by GitHub
parent e31e18927c 24dba24b2a
commit 59130d4703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3786,7 +3786,7 @@ object Classpaths {
private[sbt] def isScala2Scala3Sandwich(sbv1: String, sbv2: String): Boolean = {
def compare(a: String, b: String): Boolean =
a == "2.13" && (b.startsWith("0.") || b.startsWith("3.0"))
a == "2.13" && (b.startsWith("0.") || b.startsWith("3"))
compare(sbv1, sbv2) || compare(sbv2, sbv1)
}