Add Scala 2.12.0-M1 as a cross build

Disable genjavadoc for this variation for now.

Author: retronym

.travis.yml

@@ -12,6 +12,7 @@ script:
   - admin/build.sh
 scala:
   - 2.11.6
+  - 2.12.0-M1
 jdk:
   - oraclejdk8
 notifications:

build.sbt

@@ -2,6 +2,8 @@ scalaModuleSettings
 
 scalaVersion := "2.11.6"
 
+crossScalaVersions := List("2.11.6", "2.12.0-M1")
+
 organization := "org.scala-lang.modules"
 
 name := "scala-java8-compat"
@@ -76,8 +78,16 @@ inConfig(JavaDoc)(Defaults.configSettings) ++ (if (disableDocs) Nil else Seq(
   },
   javacOptions in JavaDoc := Seq(),
   artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"),
-  libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.8" cross CrossVersion.full),
-  scalacOptions in Compile <+= target map (t => "-P:genjavadoc:out=" + (t / "java"))
+  libraryDependencies ++= (
+    if (scalaBinaryVersion.value == "2.11")
+      compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.8" cross CrossVersion.full) :: Nil
+    else Nil
+  ),
+  scalacOptions in Compile ++= (
+    if (scalaBinaryVersion.value == "2.11")
+      ("-P:genjavadoc:out=" + (target.value / "java")) :: Nil
+    else Nil
+  )
 ))
 
 initialCommands :=