From 7c910670d676df8006f24ca3736a69f3ab46d1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Tue, 12 Mar 2019 15:28:36 +0200 Subject: [PATCH] Fix sourceDirectory for paradoxTheme (#1576) ## Purpose Updates to the updates sbt-site, which correctly uses overriden `Paradox / sourceDirectory` for both `paradox` and `paradoxTheme` settings. --- build.sbt | 2 +- project/plugins.sbt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index afabaf3641..94b3c3e071 100644 --- a/build.sbt +++ b/build.sbt @@ -264,7 +264,7 @@ lazy val docs = project ("\\.java\\.scala".r, _ => ".java") ), Paradox / siteSubdirName := s"docs/alpakka/${if (isSnapshot.value) "snapshot" else version.value}", - Paradox / sourceDirectory := sourceDirectory.value / "main" / "paradox", + Paradox / sourceDirectory := sourceDirectory.value / "main", Paradox / paradoxProperties ++= Map( "project.url" -> "https://doc.akka.io/docs/alpakka/current/", "akka.version" -> Dependencies.AkkaVersion, diff --git a/project/plugins.sbt b/project/plugins.sbt index df22d5fc8b..67459b2086 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,7 +10,10 @@ 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.3-2m") +// has following PRs merged in: +// * https://github.com/sbt/sbt-site/pull/141 +// * https://github.com/sbt/sbt-site/pull/139 +addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2+24-b76fdbbe") 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")