summaryrefslogtreecommitdiff
path: root/scalajslib
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-01-13 15:07:04 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-01-13 15:07:04 -0800
commit38ca4a5005dbaee94e674c41bb7262d603eec73c (patch)
tree9e087e24ffe21d26518c3daa956f3d063f85eea7 /scalajslib
parent57501fca3b6c2c64d32744e6d534b9de3a6674f6 (diff)
downloadmill-38ca4a5005dbaee94e674c41bb7262d603eec73c.tar.gz
mill-38ca4a5005dbaee94e674c41bb7262d603eec73c.tar.bz2
mill-38ca4a5005dbaee94e674c41bb7262d603eec73c.zip
rename OSet -> Agg
Diffstat (limited to 'scalajslib')
-rw-r--r--scalajslib/src/main/scala/mill/scalajslib/Lib.scala4
-rw-r--r--scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala8
2 files changed, 6 insertions, 6 deletions
diff --git a/scalajslib/src/main/scala/mill/scalajslib/Lib.scala b/scalajslib/src/main/scala/mill/scalajslib/Lib.scala
index 744bb262..6a85cf0c 100644
--- a/scalajslib/src/main/scala/mill/scalajslib/Lib.scala
+++ b/scalajslib/src/main/scala/mill/scalajslib/Lib.scala
@@ -21,7 +21,7 @@ object Lib {
def scalaJSLinkerIvyDep(scalaJSVersion: String): Dep =
Dep("com.lihaoyi", s"mill-jsbridge_${scalaJSVersion.replace('.', '_')}", "0.1-SNAPSHOT")
- def scalaJSLinkerBridge(classPath: Loose.OSet[Path]): ScalaJSLinkerBridge = {
+ def scalaJSLinkerBridge(classPath: Loose.Agg[Path]): ScalaJSLinkerBridge = {
val classloaderSig = classPath.map(p => p.toString().hashCode + p.mtime.toMillis).sum
LinkerBridge.scalaInstanceCache match {
case Some((`classloaderSig`, linker)) => linker
@@ -44,7 +44,7 @@ object Lib {
def link(main: Option[String],
inputPaths: Seq[Path],
- libraries: Loose.OSet[Path],
+ libraries: Loose.Agg[Path],
linker: ScalaJSLinkerBridge,
mode: OptimizeMode)
(implicit ctx: Ctx.DestCtx): PathRef = {
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