Update sbt-unidoc to version 0.4.2

dwijnand · Mar 15, 2019 · f6133bc · f6133bc
1 parent 3f291b6
commit f6133bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/project/Doc.scala b/project/Doc.scala
@@ -4,8 +4,13 @@
 package lagom
 
 import sbt._
-import sbtunidoc.Plugin.UnidocKeys._
-import sbtunidoc.Plugin.{Genjavadoc, JavaUnidoc, ScalaUnidoc, scalaJavaUnidocSettings}
+import sbtunidoc.{BaseUnidocPlugin, GenJavadocPlugin, JavaUnidocPlugin, ScalaUnidocPlugin}
+
+import sbtunidoc.BaseUnidocPlugin.autoImport._
+import sbtunidoc.JavaUnidocPlugin.autoImport._
+import sbtunidoc.GenJavadocPlugin.autoImport._
+import sbtunidoc.ScalaUnidocPlugin.autoImport._
+
 import sbt.Keys._
 import sbt.File
 import sbt.ScopeFilter.ProjectFilter
@@ -41,6 +46,8 @@ object UnidocRoot extends AutoPlugin {
 
   override def trigger = noTrigger
 
+  override def requires = BaseUnidocPlugin && ScalaUnidocPlugin && JavaUnidocPlugin
+
   private def projectsAndDependencies(projects: Seq[ProjectReference]): ProjectFilter = {
     //projects.map(p => inDependencies(p, transitive = true, includeRoot = true)).reduce(_ || _)
     projects.map(p => inProjects(p)).reduce(_ || _)
@@ -88,7 +95,7 @@ object UnidocRoot extends AutoPlugin {
     case _ => Seq("--allow-script-in-comments")
   }
 
-  override lazy val projectSettings = scalaJavaUnidocSettings ++ Seq(
+  override lazy val projectSettings = Seq(
     unidocAllSources in (JavaUnidoc, unidoc) ++= allGenjavadocSources.value,
     unidocAllSources in (JavaUnidoc, unidoc) := {
       (unidocAllSources in (JavaUnidoc, unidoc)).value

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,7 +4,7 @@ libraryDependencies ++= Seq(
   "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
 )
 
-addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3")
+addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")
 
 // the plugins used during release can have an impact on default values
 // of the build. To validate your changes on the release plugins don't