diff options
Diffstat (limited to 'scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala')
| -rw-r--r-- | scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala index 03c4e216..d26c6a70 100644 --- a/scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala @@ -27,12 +27,12 @@ trait ScalaJSModule extends scalalib.Module { outer => def scalaJSBridgeVersion = T{ scalaJSVersion().split('.').dropRight(1).mkString(".") } - def scalaJSLinkerClasspath: T[Loose.OSet[PathRef]] = T{ + def scalaJSLinkerClasspath: T[Loose.Agg[PathRef]] = T{ val jsBridgeKey = "MILL_SCALAJS_BRIDGE_" + scalaJSBridgeVersion().replace('.', '_') val jsBridgePath = sys.props(jsBridgeKey) if (jsBridgePath != null) { Success( - Loose.OSet.from( + Loose.Agg.from( jsBridgePath.split(File.pathSeparator).map(f => PathRef(Path(f), quick = true)) ) ) @@ -58,9 +58,9 @@ trait ScalaJSModule extends scalalib.Module { outer => link(mainClass(), Seq(compile().classes.path), compileDepClasspath().map(_.path), linker, FullOpt) } - override def scalacPluginIvyDeps = T{ Loose.OSet(Dep.Point("org.scala-js", "scalajs-compiler", scalaJSVersion())) } + override def scalacPluginIvyDeps = T{ Loose.Agg(Dep.Point("org.scala-js", "scalajs-compiler", scalaJSVersion())) } - override def ivyDeps = T{ Loose.OSet(Dep("org.scala-js", "scalajs-library", scalaJSVersion())) } + override def ivyDeps = T{ Loose.Agg(Dep("org.scala-js", "scalajs-library", scalaJSVersion())) } // publish artifact with name "mill_sjs0.6.4_2.12" instead of "mill_sjs0.6_2.12" def crossFullScalaJSVersion: T[Boolean] = false |