From ce9aa0c920958d6d9bd8b936f083cda5f89bc459 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 5 Oct 2018 13:32:40 -0400 Subject: [PATCH] check PluginCross.scala consisntency --- build.sbt | 6 ++++++ main/src/main/scala/sbt/PluginCross.scala | 2 +- project/Dependencies.scala | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9570bd29b..55cf3ccfe 100644 --- a/build.sbt +++ b/build.sbt @@ -545,6 +545,12 @@ lazy val mainProj = (project in file("main")) .settings( testedBaseSettings, name := "Main", + checkPluginCross := { + val sv = scalaVersion.value + val xs = IO.readLines(baseDirectory.value / "src" / "main" / "scala" / "sbt" / "PluginCross.scala") + if (xs exists { s => s.contains(s""""$sv"""") }) () + else sys.error("PluginCross.scala does not match up with the scalaVersion " + sv) + }, libraryDependencies ++= scalaXml.value ++ Seq(launcherInterface) ++ log4jDependencies ++ Seq(scalaCacheCaffeine), managedSourceDirectories in Compile += baseDirectory.value / "src" / "main" / "contraband-scala", diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala index fca253cc1..ef6ca4a44 100644 --- a/main/src/main/scala/sbt/PluginCross.scala +++ b/main/src/main/scala/sbt/PluginCross.scala @@ -96,7 +96,7 @@ private[sbt] object PluginCross { VersionNumber(sv) match { case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2" case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7" - case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.6" + case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.7" case _ => sys.error(s"Unsupported sbt binary version: $sv") } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 91ab0bde8..4c2873c55 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,6 +5,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._ object Dependencies { // WARNING: Please Scala update versions in PluginCross.scala too val scala212 = "2.12.7" + lazy val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") val baseScalaVersion = scala212 // sbt modules