From 764afb0e21bf92af993477e0c69aa8517f509b4e Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 17 Dec 2017 08:57:42 -0800 Subject: Bump Ammonite version in `build.sc` to fix upickle bug Move `assembly`/`releaseAssembly` targets out of the stub `ScalaModule`, to take advantage of the new top-level `Target` support --- scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scalaplugin/src/main') diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala index 6289811a..4ba41f86 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala +++ b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala @@ -193,12 +193,12 @@ trait ScalaModule extends Module with TaskModule{ outer => upstreamCompileOutput() ) } + def assemblyClasspath = T{ + (runDepClasspath().filter(_.path.ext != "pom") ++ + Seq(resources(), compile().classes)).map(_.path).filter(exists) + } def assembly = T{ - createAssembly( - (runDepClasspath().filter(_.path.ext != "pom") ++ - Seq(resources(), compile().classes)).map(_.path).filter(exists), - prependShellScript = prependShellScript() - ) + createAssembly(assemblyClasspath(), prependShellScript = prependShellScript()) } def classpath = T{ Seq(resources(), compile().classes) } -- cgit v1.2.3