aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Christopher Vogt <oss.nsp@cvogt.org>2017-06-12 17:12:53 -0400
committerGitHub <noreply@github.com>2017-06-12 17:12:53 -0400
commitace672254b31d7e6203b0c5a22f1c4e6dfe13f42 (patch)
tree6c12d97fe181aec35385456e8155d488ca5888f0
parentaef749eb54b15d46a516e6f92a2a16888c582d30 (diff)
parent6f0566028d7485a9b37e22b57894a760aab96755 (diff)
downloadcbt-ace672254b31d7e6203b0c5a22f1c4e6dfe13f42.tar.gz
cbt-ace672254b31d7e6203b0c5a22f1c4e6dfe13f42.tar.bz2
cbt-ace672254b31d7e6203b0c5a22f1c4e6dfe13f42.zip
Merge pull request #514 from megri/master
Make scalameta-version configurable
-rw-r--r--stage2/plugins/Scalameta.scala8
1 files 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
)
)