Skip to content

Commit 94017e1

Browse files
authored
Merge pull request #204 from sullis/scala-2.13.4-ftw
Scala 2.13.4
2 parents baefe65 + b9c9e91 commit 94017e1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ language: scala
77
scala:
88
- 2.11.12
99
- 2.12.12
10-
- 2.13.3
10+
- 2.13.4
1111

1212
env:
1313
- ADOPTOPENJDK=8

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ lazy val scalaJava8Compat = (project in file("."))
125125
(sources in Compile).value.filter(_.getName.endsWith(".java"))
126126
allJavaSources.filterNot(_.getName.contains("FuturesConvertersImpl.java")) // this file triggers bugs in genjavadoc
127127
},
128-
javacOptions in JavaDoc := Seq(),
128+
javacOptions in JavaDoc := Seq("-Xdoclint:none"),
129129
artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"),
130130
libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.16" cross CrossVersion.full),
131131
scalacOptions in Compile += "-P:genjavadoc:out=" + (target.value / "java")

0 commit comments

Comments
 (0)