diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-17 21:35:48 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-17 21:35:48 -0800 |
commit | 26e3702f3fccdedbb9dd44574678e9217d16959c (patch) | |
tree | f00f3aee83c5259313cf0847f9dcd246d67dd20e /scalalib | |
parent | a7f182ee709d77070ca53c28833821ad638a6743 (diff) | |
download | mill-26e3702f3fccdedbb9dd44574678e9217d16959c.tar.gz mill-26e3702f3fccdedbb9dd44574678e9217d16959c.tar.bz2 mill-26e3702f3fccdedbb9dd44574678e9217d16959c.zip |
Implement downloading/caching of binaries and java-source-folder support to make better-files benchmarks compile; fixes https://github.com/lihaoyi/mill/issues/37
Diffstat (limited to 'scalalib')
-rw-r--r-- | scalalib/src/main/scala/mill/scalalib/Lib.scala | 7 | ||||
-rw-r--r-- | scalalib/src/main/scala/mill/scalalib/MiscModule.scala | 14 |
2 files changed, 18 insertions, 3 deletions
diff --git a/scalalib/src/main/scala/mill/scalalib/Lib.scala b/scalalib/src/main/scala/mill/scalalib/Lib.scala index 8a98d724..a038a59b 100644 --- a/scalalib/src/main/scala/mill/scalalib/Lib.scala +++ b/scalalib/src/main/scala/mill/scalalib/Lib.scala @@ -128,7 +128,12 @@ object Lib{ val newResult = ic.compile( ic.inputs( classpath = classesIODir +: compileClasspathFiles, - sources = sources.filter(_.toIO.exists()).flatMap(ls.rec).filter(x => x.isFile && x.ext == "scala").map(_.toIO).toArray, + sources = for{ + root <- sources.toArray + if exists(root) + path <- ls.rec(root) + if path.isFile && (path.ext == "scala" || path.ext == "java") + } yield path.toIO, classesDirectory = classesIODir, scalacOptions = (scalacPluginClasspath.map(jar => s"-Xplugin:${jar}") ++ scalacOptions).toArray, javacOptions = javacOptions.toArray, diff --git a/scalalib/src/main/scala/mill/scalalib/MiscModule.scala b/scalalib/src/main/scala/mill/scalalib/MiscModule.scala index 52a95337..502ba461 100644 --- a/scalalib/src/main/scala/mill/scalalib/MiscModule.scala +++ b/scalalib/src/main/scala/mill/scalalib/MiscModule.scala @@ -8,11 +8,21 @@ import mill.util.Loose.Agg trait SbtModule extends ScalaModule { outer => - override def sources = T.input{ Agg(PathRef(basePath / 'src / 'main / 'scala)) } + override def sources = T.input{ + Agg( + PathRef(basePath / 'src / 'main / 'scala), + PathRef(basePath / 'src / 'main / 'java) + ) + } override def resources = T.input{ Agg(PathRef(basePath / 'src / 'main / 'resources)) } trait Tests extends super.Tests { override def basePath = outer.basePath - override def sources = T.input{ Agg(PathRef(basePath / 'src / 'test / 'scala)) } + override def sources = T.input{ + Agg( + PathRef(basePath / 'src / 'test / 'scala), + PathRef(basePath / 'src / 'test / 'java) + ) + } override def resources = T.input{ Agg(PathRef(basePath / 'src / 'test / 'resources)) } } } |