diff options
author | Andres Pipicello <andres.pipicello@olx.com> | 2019-05-22 20:37:49 -0300 |
---|---|---|
committer | Tobias Roeser <le.petit.fou@web.de> | 2019-06-28 08:37:39 +0200 |
commit | 3d08f9a92210bec5b790b9f924fcec2f73f99650 (patch) | |
tree | 2d2a66461a9287d8e3ed1c4eec8fe687f7298d2f /scalalib | |
parent | 5bc0ba83240756ee1965a3983f7694e66c40f748 (diff) | |
download | mill-3d08f9a92210bec5b790b9f924fcec2f73f99650.tar.gz mill-3d08f9a92210bec5b790b9f924fcec2f73f99650.tar.bz2 mill-3d08f9a92210bec5b790b9f924fcec2f73f99650.zip |
Using Task.sequence instead of multiple evals
Diffstat (limited to 'scalalib')
-rwxr-xr-x | scalalib/src/GenIdeaImpl.scala | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/scalalib/src/GenIdeaImpl.scala b/scalalib/src/GenIdeaImpl.scala index 54d66b27..84ec26fc 100755 --- a/scalalib/src/GenIdeaImpl.scala +++ b/scalalib/src/GenIdeaImpl.scala @@ -112,7 +112,7 @@ object GenIdeaImpl { libraryClasspath: Loose.Agg[Path] ) - val resolved = for((path, mod) <- modules) yield { + val resolved = evalOrElse(evaluator, Task.sequence(for((path, mod) <- modules) yield { val scalaLibraryIvyDeps = mod match{ case x: ScalaModule => x.scalaLibraryIvyDeps case _ => T.task{Loose.Agg.empty[Dep]} @@ -146,23 +146,25 @@ object GenIdeaImpl { mod.resolveDeps(scalacPluginsIvyDeps)() } - val resolvedCp: Loose.Agg[PathRef] = evalOrElse(evaluator, externalDependencies, Loose.Agg.empty) - val resolvedSrcs: Loose.Agg[PathRef] = evalOrElse(evaluator, externalSources, Loose.Agg.empty) - val resolvedSp: Loose.Agg[PathRef] = evalOrElse(evaluator, scalacPluginDependencies, Loose.Agg.empty) - val resolvedCompilerCp: Loose.Agg[PathRef] = evalOrElse(evaluator, scalaCompilerClasspath, Loose.Agg.empty) - val resolvedLibraryCp: Loose.Agg[PathRef] = evalOrElse(evaluator, externalLibraryDependencies, Loose.Agg.empty) - val scalacOpts: Seq[String] = evalOrElse(evaluator, scalacOptions, Seq()) - - ResolvedModule( - path, - resolvedCp.map(_.path).filter(_.ext == "jar") ++ resolvedSrcs.map(_.path), - mod, - resolvedSp.map(_.path).filter(_.ext == "jar"), - scalacOpts, - resolvedCompilerCp.map(_.path), - resolvedLibraryCp.map(_.path) - ) - } + T.task { + val resolvedCp: Loose.Agg[PathRef] = externalDependencies() + val resolvedSrcs: Loose.Agg[PathRef] = externalSources() + val resolvedSp: Loose.Agg[PathRef] = scalacPluginDependencies() + val resolvedCompilerCp: Loose.Agg[PathRef] = scalaCompilerClasspath() + val resolvedLibraryCp: Loose.Agg[PathRef] = externalLibraryDependencies() + val scalacOpts: Seq[String] = scalacOptions() + + ResolvedModule( + path, + resolvedCp.map(_.path).filter(_.ext == "jar") ++ resolvedSrcs.map(_.path), + mod, + resolvedSp.map(_.path).filter(_.ext == "jar"), + scalacOpts, + resolvedCompilerCp.map(_.path), + resolvedLibraryCp.map(_.path) + ) + } + }), Seq()) val moduleLabels = modules.map(_.swap).toMap |