summaryrefslogtreecommitdiff
path: root/scalaplugin/src/main
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-12-17 23:56:49 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2017-12-17 23:56:49 -0800
commita66bb3e3903e5996d0e99f26b23d5f65ab748289 (patch)
tree0a62cc1b951d5632cfa5e0c41f594dd4235161be /scalaplugin/src/main
parentbea49c176bac112ea8ac9ea53b07f4ba3b915262 (diff)
downloadmill-a66bb3e3903e5996d0e99f26b23d5f65ab748289.tar.gz
mill-a66bb3e3903e5996d0e99f26b23d5f65ab748289.tar.bz2
mill-a66bb3e3903e5996d0e99f26b23d5f65ab748289.zip
- Remove `GenIdea` dependency on compiled output (fixes https://github.com/lihaoyi/mill/issues/59)
- Add missing flag to fix downloading of source jars for IntelliJ
Diffstat (limited to 'scalaplugin/src/main')
-rw-r--r--scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala7
1 files changed, 4 insertions, 3 deletions
diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala
index 4ba41f86..1ba15061 100644
--- a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala
+++ b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala
@@ -85,7 +85,7 @@ trait ScalaModule extends Module with TaskModule{ outer =>
}
def upstreamCompileDepClasspath = T{
- Task.traverse(projectDeps.map(_.compileDepClasspath))
+ Task.traverse(projectDeps.map(_.externalCompileDepClasspath))
}
def upstreamCompileDepSources = T{
Task.traverse(projectDeps.map(_.externalCompileDepSources))
@@ -100,10 +100,11 @@ trait ScalaModule extends Module with TaskModule{ outer =>
repositories,
scalaVersion(),
scalaBinaryVersion(),
- deps()
+ deps(),
+ sources
)
}
- def externalCompileDepClasspath = T{
+ def externalCompileDepClasspath: T[Seq[PathRef]] = T{
upstreamCompileDepClasspath().flatten ++
resolveDeps(
T.task{ivyDeps() ++ compileIvyDeps() ++ scalaCompilerIvyDeps(scalaVersion())}