Merge pull request #79 from gourlaysama/bump2

bump scala, sbt and scala-module-plugin versions

Author: gourlaysama

.travis.yml

@@ -21,6 +21,7 @@ script: admin/build.sh
 jdk:
   - openjdk6
   - openjdk7
+  - oraclejdk8
 
 notifications:
   email:

build.sbt

@@ -6,9 +6,15 @@ name                       := "scala-parser-combinators"
 
 version                    := "1.0.5-SNAPSHOT"
 
-scalaVersion               := crossScalaVersions.value.head
-
-crossScalaVersions         := Seq("2.11.6", "2.12.0-M1")
+crossScalaVersions in ThisBuild := {
+  val javaVersion = System.getProperty("java.version")
+  val isJDK6Or7 =
+    javaVersion.startsWith("1.6.") || javaVersion.startsWith("1.7.")
+  if (isJDK6Or7)
+    Seq("2.11.7")
+  else
+    Seq("2.11.7", "2.12.0-M3")
+}
 
 // important!! must come here (why?)
 scalaModuleOsgiSettings

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.9

project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.3")
+addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.4")