Merge pull request #93 from sirthias/develop

Upgrade ParadoxSitePlugin to sbt-paradox 0.2.9
sbt · Apr 19, 2017 · e214391 · e214391
2 parents d9b08e0 + 85ec11a
commit e214391
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -31,7 +31,7 @@ libraryDependencies ++= Seq(
   "org.asciidoctor" % "asciidoctorj"     % "1.5.4"
 )
 
-addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.2.7")
+addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.2.9")
 
 addSbtPlugin("org.planet42"       % "laika-sbt"           % "0.6.0")
 

diff --git a/src/main/scala/com/typesafe/sbt/site/paradox/ParadoxSitePlugin.scala b/src/main/scala/com/typesafe/sbt/site/paradox/ParadoxSitePlugin.scala
@@ -20,11 +20,13 @@ object ParadoxSitePlugin extends AutoPlugin {
   import ParadoxPlugin.autoImport._
   override def projectSettings = paradoxSettings(Paradox)
   def paradoxSettings(config: Configuration): Seq[Setting[_]] =
-    ParadoxPlugin.paradoxGlobalSettings ++
+    ParadoxPlugin.paradoxSettings(config) ++
     inConfig(config)(
-      ParadoxPlugin.paradoxSettings ++
       List(
-        sourceDirectory in paradox := sourceDirectory.value,
+        sourceDirectory in paradox := {
+          val sd = sourceDirectory.value
+          if (sd.toString endsWith "/paradox/paradox") new File(sd.toString dropRight "/paradox".length) else sd
+        },
         includeFilter := AllPassFilter,
         mappings := {
           val _ = paradox.value