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

Should now be fine with 2.12.0-RC2

This commit is contained in:
Alexandre Archambault 2016-10-22 22:24:41 +02:00
parent 4b14215c33
commit d66f21636f
No known key found for this signature in database
GPG Key ID: 14640A6839C263A9
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.sbt
View File

@ -204,8 +204,7 @@ lazy val core = crossProject
)
.jsSettings(
libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % "0.9.1",
"be.doeraene" %%% "scalajs-jquery" % "0.9.0"
"org.scala-js" %%% "scalajs-dom" % "0.9.1"
)
)
@ -469,7 +468,10 @@ lazy val web = project
.settings(
libraryDependencies ++= {
if (scalaBinaryVersion.value == "2.11")
Seq("com.github.japgolly.scalajs-react" %%% "core" % "0.9.0")
Seq(
"be.doeraene" %%% "scalajs-jquery" % "0.9.0",
"com.github.japgolly.scalajs-react" %%% "core" % "0.9.0"
)
else
Seq()
},

3
core/shared/src/main/scala/coursier/ivy/IvyXml.scala
View File

@ -107,7 +107,8 @@ object IvyXml {
.find(_.label == "info")
.toRightDisjunction("Info not found")
(module, version) <- info(infoNode)
modVer <- info(infoNode)
(module, version) = modVer
dependenciesNodeOpt = node.children
.find(_.label == "dependencies")