Skip to content

Commit 6d23606

Browse files
committed
Support Scala 2.12.9
1 parent 74f72ac commit 6d23606

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ env:
1515
- SCALA_VERSION=2.12.6
1616
- SCALA_VERSION=2.12.7
1717
- SCALA_VERSION=2.12.8
18+
- SCALA_VERSION=2.12.9
1819
- SCALA_VERSION=2.13.0
1920

2021
# 2.11.12 was the first Scala 2.11.x version to work on jdk11

RELEASING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ It is often the case when this compiler plugin needs to be released for a newly
1515
* master, if no features or bug fixes were merged to master since the latest release
1616
* tag, if the master has unreleased features or bug fixes. In this case you will need to cherry pick the commit that adds support for the new Scala version.
1717
2. Create a file `version.sbt` containing `version in ThisBuild := "0.11"` which sets the version to be back-released. This will override the automatic version derivation from the git history. Alternatively you can `set version in ThisBuild := ...` in the command line.
18-
3. Change the Scala version to the release you want to perform, this is done by `++2.12.8` in the sbt command line.
18+
3. Change the Scala version to the release you want to perform, this is done by `++2.12.9` in the sbt command line.
1919
4. Publish the release by running `sbt publishSigned`. You will need Sonatype OSS repository rights to publish under `com.typesafe` organisation.
2020
5. Login to [Sonatype](https://oss.sonatype.org/) to close and release the repository.

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ lazy val defaults = Seq(
5555
crossScalaVersions := {
5656
val earliest211 = 6
5757
val latest211 = 12
58-
val latest212 = 8
58+
val latest212 = 9
5959
val latest213 = 0
6060
val skipVersions = Set("2.11.9", "2.11.10")
6161
val scala211Versions =

plugin/src/main/scala/com/typesafe/genjavadoc/Plugin.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,17 @@ class GenJavadocPlugin(val global: Global) extends Plugin {
3333
if (global.settings.isScaladoc) List.empty
3434
else List(MyComponent)
3535

36-
override def processOptions(options: List[String], error: String => Unit): Unit = {
36+
override def init(options: List[String], error: String => Unit): Boolean = {
3737
myOptions = new Properties()
3838
options foreach { str =>
3939
str.indexOf('=') match {
4040
case -1 => myOptions.setProperty(str, "true")
4141
case n => myOptions.setProperty(str.substring(0, n), str.substring(n + 1))
4242
}
4343
}
44+
true
4445
}
46+
4547
private var myOptions: Properties = _
4648

4749
lazy val outputBase = new File(myOptions.getProperty("out", "."))

0 commit comments

Comments
 (0)