From ae92f850bbc1aed932b4218f5e9c3eeb7609fd60 Mon Sep 17 00:00:00 2001
From: Johannes Rudolph <johannes.rudolph@gmail.com>
Date: Tue, 10 Jul 2018 17:07:09 +0200
Subject: [PATCH 1/4] Upgrade dependency versions

sbt 1.2.0
Scala 2.12.6
specs2 4.3.2
scalacheck 1.14.0
sbt plugin updates
---
 build.sbt                | 6 +++---
 project/build.properties | 2 +-
 project/plugins.sbt      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.sbt b/build.sbt
index 570b125a..eeda9684 100644
--- a/build.sbt
+++ b/build.sbt
@@ -37,9 +37,9 @@ libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
     "org.scalacheck" %% "scalacheck" % "1.13.4" % "test"
   )
   case Some((2, n)) if n >= 11 => Seq(
-    "org.specs2" %% "specs2-core" % "4.0.2" % "test",
-    "org.specs2" %% "specs2-scalacheck" % "4.0.2" % "test",
-    "org.scalacheck" %% "scalacheck" % "1.13.5" % "test"
+    "org.specs2" %% "specs2-core" % "4.3.2" % "test",
+    "org.specs2" %% "specs2-scalacheck" % "4.3.2" % "test",
+    "org.scalacheck" %% "scalacheck" % "1.14.0" % "test"
   )
   case _ => Nil
 })
diff --git a/project/build.properties b/project/build.properties
index d6e35076..f59579fd 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.6
+sbt.version=1.2.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
index b6875039..ed1a2509 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,7 @@
 addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.2")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")

From 6ec17cbe501e4ff2c15d324429e0caf1c0251bfe Mon Sep 17 00:00:00 2001
From: Johannes Rudolph <johannes.rudolph@gmail.com>
Date: Tue, 10 Jul 2018 17:08:49 +0200
Subject: [PATCH 2/4] Build with 2.12 by default

---
 build.sbt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build.sbt b/build.sbt
index eeda9684..c46578ac 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,8 +16,6 @@ startYear := Some(2011)
 
 licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
 
-scalaVersion := "2.11.12"
-
 scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-Xlint", "-encoding", "utf8")
 
 resolvers += Opts.resolver.sonatypeReleases
@@ -77,7 +75,7 @@ mimaBinaryIssueFilters := Seq(
 // publishing
 ///////////////
 
-crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M3")
+crossScalaVersions := Seq("2.12.6", "2.10.7", "2.11.12", "2.13.0-M3")
 
 scalaBinaryVersion := {
   val sV = scalaVersion.value

From cf83a40181e85140858c91fa1a8bb91456d4f10f Mon Sep 17 00:00:00 2001
From: Johannes Rudolph <johannes.rudolph@gmail.com>
Date: Thu, 26 Jul 2018 11:58:54 +0200
Subject: [PATCH 3/4] Cleanup build

---
 build.sbt | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/build.sbt b/build.sbt
index c46578ac..5e0c75b5 100644
--- a/build.sbt
+++ b/build.sbt
@@ -77,14 +77,6 @@ mimaBinaryIssueFilters := Seq(
 
 crossScalaVersions := Seq("2.12.6", "2.10.7", "2.11.12", "2.13.0-M3")
 
-scalaBinaryVersion := {
-  val sV = scalaVersion.value
-  if (CrossVersion.isScalaApiCompatible(sV))
-    CrossVersion.binaryScalaVersion(sV)
-  else
-    sV
-}
-
 publishMavenStyle := true
 
 useGpg := true

From d2f0f997df4487b556ef39b447cac36978bf9821 Mon Sep 17 00:00:00 2001
From: Johannes Rudolph <johannes.rudolph@gmail.com>
Date: Thu, 26 Jul 2018 14:32:38 +0200
Subject: [PATCH 4/4] Remove 2.13.0-M3 support for now

Isn't current any more and support for 2.13.0-M4 will be added later.
---
 .travis.yml |  1 -
 build.sbt   | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0e72ce9a..f7363605 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ scala:
   - 2.10.7
   - 2.11.12
   - 2.12.6
-  - 2.13.0-M3
 script:
   - sbt "++ ${TRAVIS_SCALA_VERSION}!" test mimaReportBinaryIssues
 jdk:
diff --git a/build.sbt b/build.sbt
index 5e0c75b5..30dc3d29 100644
--- a/build.sbt
+++ b/build.sbt
@@ -20,14 +20,6 @@ scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "
 
 resolvers += Opts.resolver.sonatypeReleases
 
-libraryDependencies ++=
-  (CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, n)) if n >= 13 =>
-      Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "0.1.2")
-    case _ =>
-      Nil
-  })
-
 libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
   case Some((2, 10)) => Seq(
     "org.specs2" %% "specs2-core" % "3.8.9" % "test",
@@ -75,7 +67,7 @@ mimaBinaryIssueFilters := Seq(
 // publishing
 ///////////////
 
-crossScalaVersions := Seq("2.12.6", "2.10.7", "2.11.12", "2.13.0-M3")
+crossScalaVersions := Seq("2.12.6", "2.10.7", "2.11.12")
 
 publishMavenStyle := true