From 7a8c89effc510ee216983091894073b0b063d631 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Tue, 12 Dec 2017 16:26:00 +0000
Subject: [PATCH] Update version to 1.1.0-SNAPSHOT

.. & fix project/cross-plugins-defaults.
---
 build.sbt                                            |  2 +-
 .../project/cross-plugins-defaults/build.sbt         | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.sbt b/build.sbt
index 3ebd1cbdf..ffe47d96f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -9,7 +9,7 @@ def buildLevelSettings: Seq[Setting[_]] =
   inThisBuild(
     Seq(
       organization := "org.scala-sbt",
-      version := "1.0.3-SNAPSHOT",
+      version := "1.1.0-SNAPSHOT",
       description := "sbt is an interactive build tool",
       bintrayOrganization := Some("sbt"),
       bintrayRepository := {
diff --git a/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt b/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt
index b1d361b5a..55b3bac97 100644
--- a/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt
+++ b/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt
@@ -1,4 +1,4 @@
-val baseSbt = "1.0"
+val baseSbt = "1."
 
 val buildCrossList = List("2.10.6", "2.11.11", "2.12.2")
 scalaVersion in ThisBuild := "2.12.2"
@@ -10,20 +10,20 @@ lazy val root = (project in file("."))
   .settings(
     sbtPlugin := true,
 
-    TaskKey[Unit]("check") := mkCheck("2.12", "1.0").value,
-    TaskKey[Unit]("check2") := mkCheck("2.10", "0.13").value
+    TaskKey[Unit]("check") := mkCheck("2.12", "1.0", "1.").value,
+    TaskKey[Unit]("check2") := mkCheck("2.10", "0.13", "0.13").value
   )
 
 lazy val app = (project in file("app"))
 
-def mkCheck(scalaBinV: String, sbtBinVer: String) = Def task {
+def mkCheck(scalaBinV: String, sbtBinVer: String, sbtVerPrefix: String) = Def task {
   val crossV = (sbtVersion in pluginCrossBuild).value
   val crossBinV = (sbtBinaryVersion in pluginCrossBuild).value
   val sv = projectID.value.extraAttributes("e:scalaVersion")
   assert(sbtVersion.value startsWith baseSbt, s"Wrong sbt version: ${sbtVersion.value}")
   assert(sv == scalaBinV, s"Wrong e:scalaVersion: $sv")
   assert(scalaBinaryVersion.value == scalaBinV, s"Wrong Scala binary version: ${scalaBinaryVersion.value}")
-  assert(crossV startsWith sbtBinVer, s"Wrong `sbtVersion in pluginCrossBuild`: $crossV")
+  assert(crossV startsWith sbtVerPrefix, s"Wrong `sbtVersion in pluginCrossBuild`: $crossV")
 
   val ur = update.value
   val cr = ur.configuration(Compile).get
@@ -31,7 +31,7 @@ def mkCheck(scalaBinV: String, sbtBinVer: String) = Def task {
   val plugSv = mr.module.extraAttributes("scalaVersion")
   val plugSbtV = mr.module.extraAttributes("sbtVersion")
   assert(plugSv == scalaBinV, s"Wrong plugin scalaVersion: $plugSv")
-  assert(plugSbtV == sbtBinVer, s"Wrong plugin scalaVersion: $sbtBinVer")
+  assert(plugSbtV == sbtBinVer, s"Wrong plugin sbtVersion: $plugSbtV")
 
   // crossScalaVersions in app should not be affected, per se or after ^^
   val appCrossScalaVersions = (crossScalaVersions in app).value.toList