Skip to content

Commit 589b551

Browse files
committed
bump Scala, sbt versions, and prepare for 0.11 release
1 parent 27f283a commit 589b551

File tree

6 files changed

+11
-13
lines changed

6 files changed

+11
-13
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ env:
3535
- SCALA_VERSION=2.12.2
3636
- SCALA_VERSION=2.12.3
3737
- SCALA_VERSION=2.12.4
38-
- SCALA_VERSION=2.13.0-M2
38+
- SCALA_VERSION=2.13.0-M3
3939

4040
# there's no better way it seems.. https://github.com/travis-ci/travis-ci/issues/1519
4141
matrix:
@@ -52,7 +52,7 @@ matrix:
5252
- jdk: openjdk6
5353
env: SCALA_VERSION=2.12.4
5454
- jdk: openjdk6
55-
env: SCALA_VERSION=2.13.0-M2
55+
env: SCALA_VERSION=2.13.0-M3
5656

5757
# Increasing ReservedCodeCacheSize minimizes scala compiler-interface compile times
5858
script:

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ GenJavaDoc is a Scala compiler plugin which emits structurally equivalent Java c
1212
lazy val JavaDoc = config("genjavadoc") extend Compile
1313

1414
lazy val javadocSettings = inConfig(JavaDoc)(Defaults.configSettings) ++ Seq(
15-
addCompilerPlugin("com.typesafe.genjavadoc" %% "genjavadoc-plugin" % "0.10" cross CrossVersion.full),
15+
addCompilerPlugin("com.typesafe.genjavadoc" %% "genjavadoc-plugin" % "0.11" cross CrossVersion.full),
1616
scalacOptions += s"-P:genjavadoc:out=${target.value}/java",
1717
packageDoc in Compile := (packageDoc in JavaDoc).value,
1818
sources in JavaDoc :=
@@ -65,7 +65,7 @@ GenJavaDoc can also be integrated into a Maven build (inspired by [this answer o
6565
<compilerPlugin>
6666
<groupId>com.typesafe.genjavadoc</groupId>
6767
<artifactId>genjavadoc-plugin_${scala.binary.full.version}</artifactId>
68-
<version>0.9</version>
68+
<version>0.11</version>
6969
</compilerPlugin>
7070
</compilerPlugins>
7171
</configuration>
@@ -139,7 +139,7 @@ One drawback of this choice is that the flattening of classes and companion obje
139139

140140
## Reporting Bugs
141141

142-
If you find errors in the generation process or have suggestions on how to improve the quality of the emitted JavaDoc contents, please report issues on this github project’s issue tracker.
142+
If you find errors in the generation process or have suggestions on how to improve the quality of the emitted JavaDoc contents, please report issues on this GitHub repo’s issue tracker.
143143

144144
## License
145145

RELEASING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ It is often the case when this compiler plugin needs to be released for a newly
1313

1414
1. Checkout the version that is to be back-released, which would be
1515
* master, if no features or bug fixes were merged to master since the latest release
16-
* tag, if the master has unlrealeased features or bug fixes. In this case you will need to cherry pick the commit that adds support for the new Scala version.
16+
* 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.
18-
3. Publish the release by running `sbt publishSigned`. You will have to have Sonatype OSS repository rights to publish under `com.typesafe` organisation.
18+
3. Publish the release by running `sbt publishSigned`. You will need Sonatype OSS repository rights to publish under `com.typesafe` organisation.
1919
4. 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
@@ -52,7 +52,7 @@ lazy val defaults = Seq(
5252
crossScalaVersions := {
5353
val latest211 = 12
5454
val latest212 = 4
55-
val pre213 = List("M2")
55+
val pre213 = List("M3")
5656
val skipVersions = Set("2.11.9", "2.11.10")
5757
val scala211Versions =
5858
(0 to latest211)

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,8 @@ class GenJavaDocPlugin(val global: Global) extends Plugin {
5555

5656
override val global: GT = GenJavaDocPlugin.this.global
5757

58-
val isPreFields = {
59-
val v = nsc.Properties.versionNumberString
60-
Set("2.12.0-M1", "2.12.0-M2", "2.12.0-M3", "2.12.0-M4", "2.12.0-M5").contains(v) || v.startsWith("2.11.")
61-
}
58+
val isPreFields =
59+
nsc.Properties.versionNumberString.startsWith("2.11.")
6260
override val runsAfter = List(if(isPreFields) "uncurry" else "fields")
6361
val phaseName = "GenJavaDoc"
6462

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.16
1+
sbt.version=0.13.17

0 commit comments

Comments
 (0)