From a66bb3e3903e5996d0e99f26b23d5f65ab748289 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 17 Dec 2017 23:56:49 -0800 Subject: - 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 --- scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 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())} -- cgit v1.2.3