From 6f0566028d7485a9b37e22b57894a760aab96755 Mon Sep 17 00:00:00 2001 From: megri Date: Mon, 12 Jun 2017 22:25:56 +0200 Subject: Make scalameta-version configurable --- stage2/plugins/Scalameta.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stage2/plugins/Scalameta.scala b/stage2/plugins/Scalameta.scala index 663399d..128131c 100644 --- a/stage2/plugins/Scalameta.scala +++ b/stage2/plugins/Scalameta.scala @@ -1,19 +1,21 @@ package cbt import java.io.File trait Scalameta extends BaseBuild{ + def scalaMetaVersion: String = "1.6.0" + override def scalacOptions = super.scalacOptions ++ Scalameta.scalacOptions( - Scalameta.scalaHost( scalaVersion, context.cbtLastModified, context.paths.mavenCache ).jar + Scalameta.scalaHost( scalaVersion, scalaMetaVersion, context.cbtLastModified, context.paths.mavenCache ).jar ) } object Scalameta{ def scalaHost( - scalaVersion: String, cbtLastModified: Long, mavenCache: java.io.File + scalaVersion: String, scalaMetaVersion: String, cbtLastModified: Long, mavenCache: java.io.File )( implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache ) = MavenResolver( cbtLastModified, mavenCache, mavenCentral ).bindOne( MavenDependency( - "org.scalameta", "scalahost_"+scalaVersion, "1.6.0" + "org.scalameta", "scalahost_"+scalaVersion, scalaMetaVersion ) ) -- cgit v1.2.3