aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Kirillov <darthorimar@users.noreply.github.com>2017-07-11 16:40:46 +0300
committerIlya Kirillov <darthorimar@users.noreply.github.com>2017-07-17 19:30:53 +0300
commit47baaca5d2689770e0106382865fe7cfa35e3cba (patch)
treef46aca3ad2d0bc824bcaebb2fdd25867354879ea
parente7899a40ecc3a076cf598e06d1e27a5bf43c1bf7 (diff)
downloadcbt-47baaca5d2689770e0106382865fe7cfa35e3cba.tar.gz
cbt-47baaca5d2689770e0106382865fe7cfa35e3cba.tar.bz2
cbt-47baaca5d2689770e0106382865fe7cfa35e3cba.zip
Reformat, remove extra param
-rw-r--r--stage2/plugins/ExportBuildInformation.scala11
1 files changed, 4 insertions, 7 deletions
diff --git a/stage2/plugins/ExportBuildInformation.scala b/stage2/plugins/ExportBuildInformation.scala
index baa7bec..77f9436 100644
--- a/stage2/plugins/ExportBuildInformation.scala
+++ b/stage2/plugins/ExportBuildInformation.scala
@@ -78,7 +78,7 @@ object BuildInformation {
val cbtLibraries = convertCbtLibraries
val scalaCompilers = modules
.map(_.scalaVersion)
- .map(v => ScalaCompiler(v, resolveScalaCompiler(rootBuild, v)))
+ .map(v => ScalaCompiler(v, resolveScalaCompiler(v)))
Project(
name = rootModule.name,
@@ -181,7 +181,7 @@ object BuildInformation {
.foldLeft(build +: visited)(traverse)
builds.foldLeft(Seq.empty[BaseBuild])(traverse)
- }
+ }
private def exportLibrary(dependency: BoundMavenDependency) = {
val name = formatMavenDependency(dependency.mavenDependency)
@@ -224,10 +224,8 @@ object BuildInformation {
}
.toSeq
-
-
- private def resolveScalaCompiler(build: BaseBuild, scalaVersion: String) =
- build.Resolver(mavenCentral, sonatypeReleases).bindOne(
+ private def resolveScalaCompiler(scalaVersion: String) =
+ rootBuild.Resolver(mavenCentral, sonatypeReleases).bindOne(
MavenDependency("org.scala-lang", "scala-compiler", scalaVersion)
).classpath.files
@@ -237,7 +235,6 @@ object BuildInformation {
else
source.getParentFile //Let's assume that for now
-
private def formatMavenDependency(dependency: cbt.MavenDependency) =
s"${dependency.groupId}:${dependency.artifactId}:${dependency.version}"