Skip to content

Commit 4464d41

Browse files
authored
Merge pull request #81 from retronym/bump/2.12.0-RC2
Bump to Scala 2.12.0-RC2
2 parents d3b97e6 + eabbd5f commit 4464d41

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ script:
1414
scala:
1515
- 2.11.8
1616
- 2.12.0-M5
17-
- 2.12.0-RC1
17+
- 2.12.0-RC2
1818
jdk:
1919
- oraclejdk8
2020
notifications:

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def osgiExport(scalaVersion: String, version: String) = {
1616
}
1717

1818
lazy val commonSettings = Seq(
19-
crossScalaVersions := List("2.12.0-RC1", "2.12.0-M5", "2.11.8"),
19+
crossScalaVersions := List("2.12.0-RC2", "2.12.0-M5", "2.11.8"),
2020
scalaVersion := crossScalaVersions.value.head,
2121
organization := "org.scala-lang.modules",
2222
version := "0.8.0-SNAPSHOT"
@@ -110,7 +110,7 @@ lazy val root = (project in file(".")).
110110
},
111111
javacOptions in JavaDoc := Seq(),
112112
artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"),
113-
libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.10" cross CrossVersion.full),
113+
libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.10" cross CrossVersion.fullMapped { case "2.12.0-RC2" => "2.12.0-RC1" case x => x}),
114114
scalacOptions in Compile += "-P:genjavadoc:out=" + (target.value / "java")
115115
))): _*
116116
).

0 commit comments

Comments
 (0)