summaryrefslogtreecommitdiff
path: root/scalaplugin/src/main
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-12-17 08:57:42 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2017-12-17 08:57:42 -0800
commit764afb0e21bf92af993477e0c69aa8517f509b4e (patch)
tree30b5aa2803153aac71e3a95cca472a2debe74e97 /scalaplugin/src/main
parent0817b4c5975182cd72bc27a3d22d9e1dd54bc105 (diff)
downloadmill-764afb0e21bf92af993477e0c69aa8517f509b4e.tar.gz
mill-764afb0e21bf92af993477e0c69aa8517f509b4e.tar.bz2
mill-764afb0e21bf92af993477e0c69aa8517f509b4e.zip
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
Diffstat (limited to 'scalaplugin/src/main')
-rw-r--r--scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala10
1 files changed, 5 insertions, 5 deletions
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) }