From 81757bcb1562a44e83bdde41c21a16355514cafe Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Sun, 14 Feb 2016 16:42:00 +0000
Subject: [PATCH 1/3] Bump sbt-houserules to add MiMa

See sbt/sbt#2383
---
 build.sbt         | 2 ++
 project/house.sbt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 641f7e54b..7b48e331e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,6 @@
 import Dependencies._
 import Util._
+import com.typesafe.tools.mima.core._, ProblemFilters._
 
 def baseVersion: String = "0.1.0-M8"
 def internalPath   = file("internal")
@@ -28,6 +29,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
     "-Ywarn-dead-code",
     "-Ywarn-numeric-widen",
     "-Ywarn-value-discard"),
+  previousArtifact := None, // Some(organization.value %% moduleName.value % "1.0.0"),
   publishArtifact in Compile := true,
   publishArtifact in Test := true
 )
diff --git a/project/house.sbt b/project/house.sbt
index fede298d1..555559b37 100644
--- a/project/house.sbt
+++ b/project/house.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.2.1")
+addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.1")

From dc410f9842884e80666ecb25af55a3c6c693d81d Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Sun, 14 Feb 2016 23:00:25 +0000
Subject: [PATCH 2/3] Unexecute Positions

---
 .../src/main/scala/sbt/internal/util/Positions.scala              | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 internal/util-collection/src/main/scala/sbt/internal/util/Positions.scala

diff --git a/internal/util-collection/src/main/scala/sbt/internal/util/Positions.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Positions.scala
old mode 100755
new mode 100644

From e1c7f39e5a819f3f0ae560f9728cf09508a5afd2 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Sun, 14 Feb 2016 23:15:32 +0000
Subject: [PATCH 3/3] Exempt out of -Xfuture in util-collection

---
 build.sbt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 7b48e331e..bbfa3f30f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -80,7 +80,9 @@ lazy val utilCollection = (project in internalPath / "util-collection").
   settings(
     commonSettings,
     Util.keywordsSettings,
-    name := "Util Collection"
+    name := "Util Collection",
+    scalacOptions --= // scalac 2.10 rejects some HK types under -Xfuture it seems..
+      (CrossVersion partialVersion scalaVersion.value collect { case (2, 10) => "-Xfuture" }).toList
   )
 
 lazy val utilApplyMacro = (project in internalPath / "util-appmacro").