Skip to content

Commit 8c9071f

Browse files
authored
Merge pull request #71 from szeiger/wip/scala-2.12.0-M5
Support Scala 2.12.0-M5
2 parents fd8a54a + 8369f39 commit 8c9071f

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
@@ -13,7 +13,7 @@ script:
1313
- admin/build.sh
1414
scala:
1515
- 2.11.8
16-
- 2.12.0-M4
16+
- 2.12.0-M5
1717
jdk:
1818
- oraclejdk8
1919
notifications:

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def jwrite(dir: java.io.File)(name: String, content: String) = {
1010

1111
lazy val commonSettings = Seq(
1212
scalaVersion := "2.11.8",
13-
crossScalaVersions := List("2.11.8", "2.12.0-M4"),
13+
crossScalaVersions := List("2.11.8", "2.12.0-M5"),
1414
organization := "org.scala-lang.modules",
1515
version := "0.8.0-SNAPSHOT"
1616
)
@@ -102,7 +102,7 @@ lazy val root = (project in file(".")).
102102
},
103103
javacOptions in JavaDoc := Seq(),
104104
artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"),
105-
libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.9" cross CrossVersion.full),
105+
libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.10" cross CrossVersion.full),
106106
scalacOptions in Compile += "-P:genjavadoc:out=" + (target.value / "java")
107107
))): _*
108108
).

0 commit comments

Comments
 (0)