From 836911deabcfdb70f0404c905d8c0c234f60f697 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Tue, 21 Jun 2016 17:40:24 +0100
Subject: [PATCH] Bump to Java 7 (#2649)

---
 .travis.yml           | 4 ++--
 project/Release.scala | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 69ade0192..c7f69cbfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ language: scala
 
 # TODO - we'd like to actually test everything, but the process library has a deadlock right now
 jdk:
-  - openjdk6
-#  - oraclejdk7
+  - openjdk7
+  - oraclejdk7
 
 env:
   matrix:
diff --git a/project/Release.scala b/project/Release.scala
index 30c103b25..fbe2f255d 100644
--- a/project/Release.scala
+++ b/project/Release.scala
@@ -20,6 +20,6 @@ object Release {
   )
 
   def javaVersionCheckSettings = Seq(
-    javaVersionPrefix in javaVersionCheck := Some("1.6")
+    javaVersionPrefix in javaVersionCheck := Some("1.7")
   )
 }