diff --git a/.travis.yml b/.travis.yml index 1cad8a5..1c947dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,7 @@ script: - admin/build.sh scala: - 2.11.8 - - 2.12.0-M5 - - 2.12.0-RC2 + - 2.12.0 jdk: - oraclejdk8 notifications: diff --git a/build.sbt b/build.sbt index ad58329..05834ad 100644 --- a/build.sbt +++ b/build.sbt @@ -16,7 +16,7 @@ def osgiExport(scalaVersion: String, version: String) = { } lazy val commonSettings = Seq( - crossScalaVersions := List("2.12.0-RC2", "2.12.0-M5", "2.11.8"), + crossScalaVersions := List("2.12.0", "2.11.8"), scalaVersion := crossScalaVersions.value.head, organization := "org.scala-lang.modules", version := "0.8.0-SNAPSHOT" @@ -110,7 +110,7 @@ lazy val root = (project in file(".")). }, 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.10" cross CrossVersion.fullMapped { case "2.12.0-RC2" => "2.12.0-RC1" case x => x}), + libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.10" cross CrossVersion.fullMapped { case "2.12.0" => "2.12.0-RC1" case x => x}), scalacOptions in Compile += "-P:genjavadoc:out=" + (target.value / "java") ))): _* ).