From 892779860fe76583dbec0b8459a1a6c09101b96a Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 10 Jul 2017 22:21:02 +0300 Subject: Now libraries is also take from extra modules --- stage2/plugins/ExportBuildInformation.scala | 14 +++++++------- 1 file 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))) -- cgit v1.2.3