summaryrefslogtreecommitdiff
path: root/build.sc
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-01-23 01:38:20 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-01-23 01:50:56 -0800
commit0ea8b3d10ae7500426b174a33ef70d03d474ecc4 (patch)
treeee18b2e3605dd3c71c0d00d9eed7383b4a38529c /build.sc
parent4a0658da074bc7b7df0c5bdff90e2c6bb1977b15 (diff)
downloadmill-0ea8b3d10ae7500426b174a33ef70d03d474ecc4.tar.gz
mill-0ea8b3d10ae7500426b174a33ef70d03d474ecc4.tar.bz2
mill-0ea8b3d10ae7500426b174a33ef70d03d474ecc4.zip
WIP splitting `mill.scalaworker` out of `mill.scalalib` and into it's own isolated module/classloader. Most scalalib test pass, tho GenIdea is still broken
Diffstat (limited to 'build.sc')
-rwxr-xr-xbuild.sc17
1 files changed, 15 insertions, 2 deletions
diff --git a/build.sc b/build.sc
index 1033fc48..2d240084 100755
--- a/build.sc
+++ b/build.sc
@@ -52,7 +52,7 @@ object core extends MillModule {
ivy"com.lihaoyi::pprint:0.5.3",
ivy"com.lihaoyi:::ammonite:1.0.3-21-05b5d32",
ivy"org.scala-sbt::zinc:1.0.5",
- ivy"org.scala-sbt:test-interface:1.0"
+ ivy"org.scala-sbt:test-interface:1.0",
)
def generatedSources = T {
@@ -116,6 +116,16 @@ object scalalib extends MillModule {
}
}
+object scalaworker extends MillModule{
+ def moduleDeps = Seq(core, scalalib)
+
+ def ivyDeps = Agg(
+ ivy"org.scala-sbt::zinc:1.0.5",
+ ivy"org.scala-sbt:test-interface:1.0"
+ )
+}
+
+
object scalajslib extends MillModule {
def moduleDeps = Seq(scalalib)
@@ -181,7 +191,10 @@ def assemblyBase(classpath: Agg[Path], extraArgs: String)
}
def devAssembly = T{
- assemblyBase(Agg.from(assemblyClasspath().flatten.map(_.path)), (scalalib.testArgs() ++ scalajslib.testArgs()).mkString(" "))
+ assemblyBase(
+ Agg.from(assemblyClasspath().flatten.map(_.path)),
+ (scalalib.testArgs() ++ scalajslib.testArgs() ++ Seq(scalaworker.jar())).mkString(" ")
+ )
}
def releaseAssembly = T{