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

Support Scala 3.1 in sandwich scenario

This commit is contained in:
Damian Reeves 2021-10-23 10:33:36 -04:00
parent e46c2e3c3a
commit eeebcc41bf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ object VirtualAxis {
private[sbt] def isScala2Scala3Sandwich(sbv1: String, sbv2: String): Boolean = { private[sbt] def isScala2Scala3Sandwich(sbv1: String, sbv2: String): Boolean = {
def compare(a: String, b: 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.0") || b.startsWith("3.1"))
compare(sbv1, sbv2) || compare(sbv2, sbv1) compare(sbv1, sbv2) || compare(sbv2, sbv1)
} }