Merge pull request #82 from retronym/bump/2.12.0

Bump to Scala 2.12.0
scala · Oct 29, 2016 · 84a0a47 · 84a0a47
2 parents 4464d41 + f4f54a3
commit 84a0a47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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")
     ))): _*
   ).