diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-10 19:45:43 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-10 19:45:43 -0800 |
| commit | c9265b57c3ab2fbebca6a56d60ab2acaa636e76b (patch) | |
| tree | b79c5700effbcb5ef4568977f2e5cac5eb968eab | |
| parent | 6c913f1647c7d0850da46a910ed8176747007138 (diff) | |
| download | mill-c9265b57c3ab2fbebca6a56d60ab2acaa636e76b.tar.gz mill-c9265b57c3ab2fbebca6a56d60ab2acaa636e76b.tar.bz2 mill-c9265b57c3ab2fbebca6a56d60ab2acaa636e76b.zip | |
Make ScalaJSModule avoid stomping over existing definitions
| -rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 11 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/TestRunner.scala | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index 982f9682..bc840817 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -148,9 +148,14 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => PathRef(outputPath) } - override def scalacPluginIvyDeps = T{ Loose.Agg(Dep.Point("org.scala-js", "scalajs-compiler", scalaJSVersion())) } - - override def ivyDeps = T{ Loose.Agg(ivy"org.scala-js::scalajs-library:${scalaJSVersion()}") } + override def scalacPluginIvyDeps = T{ + super.scalacPluginIvyDeps() ++ + Seq(Dep.Point("org.scala-js", "scalajs-compiler", scalaJSVersion())) + } + override def ivyDeps = T{ + super.ivyDeps() ++ + Seq(ivy"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 diff --git a/scalalib/src/mill/scalalib/TestRunner.scala b/scalalib/src/mill/scalalib/TestRunner.scala index e7521989..0654e5ef 100644 --- a/scalalib/src/mill/scalalib/TestRunner.scala +++ b/scalalib/src/mill/scalalib/TestRunner.scala @@ -12,9 +12,9 @@ object TestRunner { selector: String, duration: Long, status: String, - exceptionName: Option[String], - exceptionMsg: Option[String], - exceptionTrace: Option[Seq[StackTraceElement]]) + exceptionName: Option[String] = None, + exceptionMsg: Option[String] = None, + exceptionTrace: Option[Seq[StackTraceElement]] = None) object Result{ implicit def resultRW: upickle.default.ReadWriter[Result] = upickle.default.macroRW[Result] |