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

Merge pull request #372 from adpi2/fix-6388 

No binary scala warning if 3 and 2.13
This commit is contained in:
eugene yokota 2021-03-18 10:45:01 -04:00 committed by GitHub
parent 685eb71aa9 fd9e1cd929
commit beb45007dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ivy/src/main/scala/sbt/internal/librarymanagement/IvyScalaUtil.scala
View File

@ -144,7 +144,13 @@ object IvyScalaUtil {
val depBinaryVersion = CrossVersion.binaryScalaVersion(id.getRevision)
def isScalaLangOrg = id.getOrganisation == scalaOrganization
def isScalaArtifact = scalaArtifacts.contains[String](id.getName)
def hasBinVerMismatch = depBinaryVersion != scalaBinaryVersion
def hasBinVerMismatch =
depBinaryVersion != scalaBinaryVersion &&
// scala 2.13 is compatible with scala 3.x
Seq(depBinaryVersion, scalaBinaryVersion)
.forall(bv => bv.startsWith("3") || bv.startsWith("2.13"))
def matchesOneOfTheConfigs = dep.getModuleConfigurations exists { scalaVersionConfigs }
val mismatched = isScalaLangOrg && isScalaArtifact && hasBinVerMismatch && matchesOneOfTheConfigs
if (mismatched)