From 848cdfac5f83f743cfecfed876f04c1e5e435638 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 8 Aug 2024 17:40:05 -0700 Subject: [PATCH 1/2] genjavadoc 0.19 (was 0.18) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d24fef7..8e0af87 100644 --- a/build.sbt +++ b/build.sbt @@ -131,7 +131,7 @@ lazy val scalaJava8Compat = (project in file(".")) JavaDoc / packageDoc / artifactName := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"), libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => Seq() - case _ => Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.18" cross CrossVersion.full)) + case _ => Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.19" cross CrossVersion.full)) }), Compile / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => Seq() From e51ccf8565260cbf4572bbbc802613892eae2579 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 8 Aug 2024 17:58:07 -0700 Subject: [PATCH 2/2] genjavadoc 0.18 was the final version for Scala 2.11 --- build.sbt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 8e0af87..92e23dd 100644 --- a/build.sbt +++ b/build.sbt @@ -130,8 +130,9 @@ lazy val scalaJava8Compat = (project in file(".")) JavaDoc / javacOptions := Seq("-Xdoclint:none"), JavaDoc / packageDoc / artifactName := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"), libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { - case Some((3, _)) => Seq() - case _ => Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.19" cross CrossVersion.full)) + case Some((3, _)) => Seq() + case Some((2, 11)) => Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.18" cross CrossVersion.full)) + case _ => Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.19" cross CrossVersion.full)) }), Compile / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => Seq()