From 9706577c67d9c63fe08e2a1edad2b3fc91c9dfde Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Tue, 21 Jun 2016 17:51:16 +0100
Subject: [PATCH] Drop Scala 2.10, add openjdk7

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

diff --git a/.travis.yml b/.travis.yml
index bb23581e8..44dc5a257 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: scala
 scala:
-   - 2.10.6
-   - 2.11.7
+  - 2.11.8
 jdk:
-   - oraclejdk8
-   - oraclejdk7
+  - openjdk7
+  - oraclejdk7
+  - oraclejdk8
diff --git a/build.sbt b/build.sbt
index 6222b2428..ab16fd295 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,7 +14,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
   testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
   javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"),
   incOptions := incOptions.value.withNameHashing(true),
-  crossScalaVersions := Seq(scala210, scala211),
+  crossScalaVersions := Seq(scala211),
   resolvers += Resolver.sonatypeRepo("public"),
   scalacOptions += "-Ywarn-unused",
   scalacOptions += "-Ywarn-unused-import",
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index c06e52b1f..8bd5bf78c 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -2,7 +2,6 @@ import sbt._
 import Keys._
 
 object Dependencies {
-  lazy val scala210 = "2.10.6"
   lazy val scala211 = "2.11.8"
 
   val ioVersion = "1.0.0-M6"