From aa38b470e151043025125628872e3aa10eb3225d Mon Sep 17 00:00:00 2001 From: "Sean C. Sullivan" Date: Thu, 31 Dec 2020 20:11:43 -0800 Subject: [PATCH 1/2] Scala 2.13.4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bcf2b8d..a0b9fd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ language: scala scala: - 2.11.12 - 2.12.12 - - 2.13.3 + - 2.13.4 env: - ADOPTOPENJDK=8 From b9c9e91c7c2785c73c3ae7e0b096c82a3c109390 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 28 Jan 2021 19:38:52 -0800 Subject: [PATCH 2/2] attempt to avoid weird Javadoc heisenerror --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 816cc65..0396985 100644 --- a/build.sbt +++ b/build.sbt @@ -125,7 +125,7 @@ lazy val scalaJava8Compat = (project in file(".")) (sources in Compile).value.filter(_.getName.endsWith(".java")) allJavaSources.filterNot(_.getName.contains("FuturesConvertersImpl.java")) // this file triggers bugs in genjavadoc }, - javacOptions in JavaDoc := Seq(), + javacOptions in JavaDoc := Seq("-Xdoclint:none"), artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"), libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.16" cross CrossVersion.full), scalacOptions in Compile += "-P:genjavadoc:out=" + (target.value / "java")