Merge pull request #150 from dwijnand/merge-1.1.x-into-1.x

Merge 1.1.x into 1.x

build.sbt

@@ -2,7 +2,6 @@ import Dependencies._
 import Util._
 //import com.typesafe.tools.mima.core._, ProblemFilters._
 
-def baseVersion = "1.0.2-SNAPSHOT"
 def internalPath = file("internal")
 
 def commonSettings: Seq[Setting[_]] = Seq(
@@ -33,7 +32,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
 val mimaSettings = Def settings (
   mimaPreviousArtifacts := Set(
     "1.0.0", "1.0.1", "1.0.2", "1.0.3",
-    "1.1.0", "1.1.1",
+    "1.1.0", "1.1.1", "1.1.2",
   ) map (version =>
     organization.value %% moduleName.value % version
       cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
@@ -55,7 +54,7 @@ lazy val utilRoot: Project = (project in file("."))
   .settings(
     inThisBuild(
       Seq(
-        git.baseVersion := baseVersion,
+        git.baseVersion := "1.2.0",
         version := {
           val v = version.value
           if (v contains "SNAPSHOT") git.baseVersion.value

project/build.properties

@@ -1 +1 @@
-sbt.version=1.1.0
+sbt.version=1.1.1