diff options
| author | Ilya Kirillov <darthorimar@users.noreply.github.com> | 2017-07-10 22:21:02 +0300 |
|---|---|---|
| committer | Ilya Kirillov <darthorimar@users.noreply.github.com> | 2017-07-17 19:30:53 +0300 |
| commit | 892779860fe76583dbec0b8459a1a6c09101b96a (patch) | |
| tree | 63163d7c04b908e82ae39a06d8a6e7d5f233abaa | |
| parent | 0b2d5fffa3c92fd976c778f8e612d17257b52870 (diff) | |
| download | cbt-892779860fe76583dbec0b8459a1a6c09101b96a.tar.gz cbt-892779860fe76583dbec0b8459a1a6c09101b96a.tar.bz2 cbt-892779860fe76583dbec0b8459a1a6c09101b96a.zip | |
Now libraries is also take from extra modules
| -rw-r--r-- | stage2/plugins/ExportBuildInformation.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/stage2/plugins/ExportBuildInformation.scala b/stage2/plugins/ExportBuildInformation.scala index ebbfd2a..a8f5160 100644 --- a/stage2/plugins/ExportBuildInformation.scala +++ b/stage2/plugins/ExportBuildInformation.scala @@ -61,21 +61,21 @@ object BuildInformation { class BuildInformationExporter(rootBuild: BaseBuild, extraModuleNames: Seq[String]) { def exportBuildInformation: Project = { val moduleBuilds = transitiveBuilds(rootBuild) - val libraries = moduleBuilds - .flatMap(_.transitiveDependencies) - .collect { case d: BoundMavenDependency => exportLibrary(d) } - .distinct - val cbtLibraries = convertCbtLibraries - val rootModule = exportModule(rootBuild) - val extraModuleBuilds = extraModuleNames .map(f => new File(f)) .filter(f => f.exists && f.isDirectory) .map(f => DirectoryDependency(f)(rootBuild.context).dependency.asInstanceOf[BaseBuild]) .flatMap(transitiveBuilds) + val rootModule = exportModule(rootBuild) val modules = (moduleBuilds ++ extraModuleBuilds) .map(exportModule) .distinct + + val libraries = (moduleBuilds ++ extraModuleBuilds) + .flatMap(_.transitiveDependencies) + .collect { case d: BoundMavenDependency => exportLibrary(d) } + .distinct + val cbtLibraries = convertCbtLibraries val scalaCompilers = modules .map(_.scalaVersion) .map(v => ScalaCompiler(v, resolveScalaCompiler(rootBuild, v))) |