Skip to content

Commit ace8c02

Browse files
committed
Fix compilation on 0.13.x
1 parent 83b5184 commit ace8c02

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

Diff for: src/main/scala-sbt-0.13/explicitdeps/package.scala

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import sbt.ModuleID
2+
13
package object explicitdeps {
24

35
type Binary = sbt.CrossVersion.Binary
@@ -22,4 +24,6 @@ package object explicitdeps {
2224
def \@(attributeName: String): String = (nodeSeq \ ("@" + attributeName)).text
2325

2426
}
27+
28+
def modulePlatform(m: ModuleID): Option[ScalaJSVersion] = None
2529
}

Diff for: src/main/scala-sbt-1.0/explicitdeps/package.scala

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import sbt.librarymanagement.ModuleID
12
package object explicitdeps {
23

34
type Binary = sbt.librarymanagement.Binary
@@ -33,5 +34,16 @@ package object explicitdeps {
3334
log.debug(s"Library dependencies:\n${allLibraryDeps.mkString(" ", "\n ", "")}")
3435
allLibraryDeps
3536
}
37+
38+
def modulePlatform(moduleId: ModuleID): Option[ScalaJSVersion] =
39+
moduleId.crossVersion match {
40+
case b: sbt.librarymanagement.Binary =>
41+
if(b.prefix == ScalaJSVersion.V1.prefix)
42+
Some(ScalaJSVersion.V1)
43+
else if (b.prefix == ScalaJSVersion.V06.prefix)
44+
Some(ScalaJSVersion.V06)
45+
else None
46+
case _ => None
47+
}
3648

3749
}

Diff for: src/main/scala/explicitdeps/BoringStuff.scala

+1-5
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,7 @@ object BoringStuff {
119119

120120
def moduleIDToDependency(moduleId: ModuleID): Dependency = {
121121
val isCross = moduleId.crossVersion.isInstanceOf[Binary] || moduleId.crossVersion.isInstanceOf[Full]
122-
val platform = moduleId.crossVersion match {
123-
case b: Binary if b.prefix == ScalaJSVersion.V1.prefix => Some(ScalaJSVersion.V1)
124-
case b: Binary if b.prefix == ScalaJSVersion.V06.prefix => Some(ScalaJSVersion.V06)
125-
case _ => None
126-
}
122+
val platform = modulePlatform(moduleId)
127123

128124
Dependency(
129125
moduleId.organization,

0 commit comments

Comments
 (0)