Drops support for JDK6

densh · Jul 27, 2015 · b4ce3a6 · b4ce3a6
1 parent 9ac9540
commit b4ce3a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 language: scala
 scala:
-  - 2.11.6
+  - 2.11.7
 script:
   - sbt ++$TRAVIS_SCALA_VERSION "tests/test" "jmh/compile" "root/publishOnlyWhenOnMaster"
 jdk:
-  - openjdk6
   - openjdk7
   - oraclejdk7
   - oraclejdk8

diff --git a/project/Build.scala b/project/Build.scala
@@ -58,8 +58,8 @@ object RegionsBuild extends Build {
     val pr         = Try(sys.env("TRAVIS_PULL_REQUEST")).getOrElse("false") != "false"
     val branch     = Try(sys.env("TRAVIS_BRANCH")).getOrElse("??")
     val snapshot   = version.value.trim.endsWith("SNAPSHOT")
-    val jdk6       = System.getProperty("java.version").contains("1.6.")
-    (travis, pr, branch, snapshot, jdk6) match {
+    val jdk7       = System.getProperty("java.version").contains("1.7.")
+    (travis, pr, branch, snapshot, jdk7) match {
       case (true, false, "master", true, true) => publish
       case _                                   => Def.task ()
     }