Scala 2.12.0-M3

xuwei-k · Oct 29, 2015 · 22683bc · 22683bc · xuwei-k · Oct 29, 2015
1 parent 4d224c5
commit 22683bc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,5 +3,7 @@ sudo: false
 scala:
    - 2.10.4
    - 2.11.6
-   - 2.12.0-M1
-
+matrix:
+  include:
+    - scala: 2.12.0-M3
+      jdk: oraclejdk8
diff --git a/build.sbt b/build.sbt
@@ -4,17 +4,23 @@ scalaVersion := "2.11.6"
 
 sonatypeSettings
 
-crossScalaVersions := Seq("2.11.6", "2.10.5", "2.12.0-M1")
+crossScalaVersions := Seq("2.11.6", "2.10.5", "2.12.0-M3")
 
 organization := "com.trueaccord.lenses"
 
 profileName := "com.trueaccord"
 
-scalacOptions += "-target:jvm-1.7"
+scalacOptions ++= {
+  if(scalaVersion.value.startsWith("2.12")) {
+    Nil
+  } else {
+    List("-target:jvm-1.7")
+  }
+}
 
 libraryDependencies ++= Seq(
-  "org.scalacheck" %% "scalacheck" % "1.12.4" % "test",
-  "org.scalatest" %% "scalatest" % (if (scalaVersion.value.startsWith("2.12")) "2.2.5-M1" else "2.2.5") % "test"
+  "org.scalacheck" %% "scalacheck" % "1.12.5" % "test",
+  "org.scalatest" %% "scalatest" % (if (scalaVersion.value.startsWith("2.12")) "2.2.5-M3" else "2.2.5") % "test"
 )
 
 pomExtra in ThisBuild := {