From cba524ebfbf009e6142530e89695a630648003d2 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 28 Nov 2017 15:57:16 -0500
Subject: [PATCH 1/2] Bump Scala versions

---
 build.sbt                  | 5 ++++-
 project/Dependencies.scala | 8 ++++----
 project/build.properties   | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.sbt b/build.sbt
index 2da5d34b..026827ca 100644
--- a/build.sbt
+++ b/build.sbt
@@ -33,7 +33,10 @@ val io = (project in file("io"))
   .settings(
     commonSettings,
     name := "IO",
-    libraryDependencies ++= Seq(scalaCompiler.value % Test, scalaCheck % Test, scalatest % Test),
+    libraryDependencies ++= {
+      if (scalaVersion.value startsWith "2.13.") Vector()
+      else Vector(scalaCompiler.value % Test, scalaCheck % Test, scalatest % Test)
+    },
     sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
     initialCommands in console += "\nimport sbt.io._, syntax._",
     mimaPreviousArtifacts := Set(organization.value %% moduleName.value % "1.0.0"),
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index a11c2271..e03c377e 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -2,10 +2,10 @@ import sbt._
 import Keys._
 
 object Dependencies {
-  val scala210 = "2.10.6"
-  val scala211 = "2.11.11"
-  val scala212 = "2.12.3"
-  val scala213 = "2.13.0-M1"
+  val scala210 = "2.10.7"
+  val scala211 = "2.11.12"
+  val scala212 = "2.12.4"
+  val scala213 = "2.13.0-M2"
 
   val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }
 
diff --git a/project/build.properties b/project/build.properties
index 94005e58..394cb75c 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.0
+sbt.version=1.0.4

From 8ff7f030c1c9bf263bce95784b465b2c9a12372e Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 28 Nov 2017 22:21:17 -0500
Subject: [PATCH 2/2] updatre Travis

---
 .travis.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 60ac5d9c..a261d539 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,21 @@
 language: scala
 jdk: oraclejdk8
-script: sbt ++$TRAVIS_SCALA_VERSION mimaReportBinaryIssues scalafmt::test test:scalafmt::test sbt:scalafmt::test test
 
-scala:
-   - 2.10.6
-   - 2.11.11
-   - 2.12.3
-   - 2.13.0-M1
+matrix:
+  include:
+   - scala: 2.10.7
+     env: CMD="mimaReportBinaryIssues scalafmt::test test:scalafmt::test sbt:scalafmt::test test"
+
+   - scala: 2.11.12
+     env: CMD="mimaReportBinaryIssues scalafmt::test test:scalafmt::test sbt:scalafmt::test test"
+
+   - scala: 2.12.4
+     env: CMD="mimaReportBinaryIssues scalafmt::test test:scalafmt::test sbt:scalafmt::test test"
+
+   - scala: 2.13.0-M2
+     env: CMD=compile
+
+script: sbt ++$TRAVIS_SCALA_VERSION $CMD
 
 cache:
   directories: