From bc2a6d33b6aa05c9df0f694c49eb6449b1c22437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Wed, 19 Dec 2018 14:37:50 +0700 Subject: [PATCH] Fix some dead links in scaladoc --- build.sbt | 10 +++++++--- project/plugins.sbt | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index e0d9b8721f..6a018ec1d0 100644 --- a/build.sbt +++ b/build.sbt @@ -226,13 +226,17 @@ lazy val unixdomainsocket = alpakkaProject( lazy val xml = alpakkaProject("xml", "xml", Dependencies.Xml) lazy val docs = project - .enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin) + .enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin) .disablePlugins(BintrayPlugin, MimaPlugin) - .settings(addMappingsToSiteDir(LocalRootProject / ScalaUnidoc / packageDoc / mappings, SiteScaladoc / siteSubdirName)) .settings( name := "Alpakka", publish / skip := true, - SiteScaladoc / siteSubdirName := s"api/alpakka/${version.value}", + makeSite := makeSite.dependsOn(LocalRootProject / ScalaUnidoc / doc).value, + Preprocess / siteSubdirName := s"api/alpakka/${version.value}", + Preprocess / sourceDirectory := (LocalRootProject / ScalaUnidoc / unidoc / target).value, + Preprocess / preprocessRules := Seq( + ("\\.java\\.scala".r, _ => ".java") + ), Paradox / siteSubdirName := s"docs/alpakka/${version.value}", Paradox / sourceDirectory := sourceDirectory.value / "main" / "paradox", Paradox / paradoxProperties ++= Map( diff --git a/project/plugins.sbt b/project/plugins.sbt index 5b9038775f..140720029d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,11 +10,11 @@ addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "2.1.0") addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0") addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.13") -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2") +addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.3-2m") addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.4.1") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "0.4") addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.4") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.4") -// patched version of sbt-dependency-graph +// patched version of sbt-dependency-graph and sbt-site resolvers += Resolver.bintrayIvyRepo("2m", "sbt-plugins")