summaryrefslogtreecommitdiff
path: root/scalajslib
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-11 00:50:59 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-11 00:50:59 -0800
commita40be9487a39ca5d98444d1f7adc053adbc42649 (patch)
treeae37eaf32db9341486566f468787baac0cbcd436 /scalajslib
parent7677210d9fce7ac1fde9615d429e6c79d058b72a (diff)
downloadmill-a40be9487a39ca5d98444d1f7adc053adbc42649.tar.gz
mill-a40be9487a39ca5d98444d1f7adc053adbc42649.tar.bz2
mill-a40be9487a39ca5d98444d1f7adc053adbc42649.zip
WIP getting Scala.js dependencies working nicely
Diffstat (limited to 'scalajslib')
-rw-r--r--scalajslib/src/mill/scalajslib/ScalaJSModule.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
index 4cc70bf9..5ab54716 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
@@ -41,11 +41,9 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
) else resolveDependencies(
Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")),
"2.12.4",
- Seq(Dep(
- "com.lihaoyi",
- s"mill-scalajslib-jsbridges_${scalaJSBridgeVersion().replace('.', '_')}",
- sys.props("MILL_VERSION")
- ))
+ Seq(
+ ivy"com.lihaoyi::mill-scalajslib-jsbridges-${scalaJSBridgeVersion()}:${sys.props("MILL_VERSION")}"
+ )
).map(_.find(_.path.toString.contains("mill-jsbridge")).get)
}
@@ -150,7 +148,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
override def scalacPluginIvyDeps = T{
super.scalacPluginIvyDeps() ++
- Seq(Dep.Point("org.scala-js", "scalajs-compiler", scalaJSVersion()))
+ Seq(ivy"org.scala-js:::scalajs-compiler:${scalaJSVersion()}")
}
override def ivyDeps = T{
super.ivyDeps() ++
@@ -167,6 +165,8 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
override def artifactSuffix: T[String] = T {
s"_sjs${artifactScalaJSVersion()}_${artifactScalaVersion()}"
}
+
+ override def platformSuffix = s"_sjs${artifactScalaJSVersion()}"
}
trait TestScalaJSModule extends ScalaJSModule with TestModule {