Skip to content

Commit

Permalink
Fix sourceDirectory for paradoxTheme (#1576)
Browse files Browse the repository at this point in the history
## Purpose

Updates to the updates sbt-site, which correctly uses overriden `Paradox / sourceDirectory` for both `paradox` and `paradoxTheme` settings.
  • Loading branch information
2m authored and ennru committed Mar 12, 2019
1 parent dba07a6 commit 7c91067
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 4 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 7c91067

Please sign in to comment.