From 0918977a182ac5b8e8283089242da6b4c6869ef0 Mon Sep 17 00:00:00 2001 From: BennyHill Date: Mon, 28 Aug 2017 17:03:41 +0200 Subject: [PATCH] Update sbt-microsites to 0.6.1 (#1868) --- build.sbt | 12 ++++++++---- project/plugins.sbt | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index bab8cd4060..30a16c2d48 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -import com.typesafe.sbt.SbtGhPages.GhPagesKeys._ +import microsites._ import sbtunidoc.Plugin.UnidocKeys._ import ReleaseTransformations._ import scala.xml.transform.{RewriteRule, RuleTransformer} @@ -149,7 +149,12 @@ lazy val docSettings = Seq( micrositeBaseUrl := "cats", micrositeDocumentationUrl := "api", micrositeGithubOwner := "typelevel", - micrositeExtraMdFiles := Map(file("CONTRIBUTING.md") -> "contributing.md"), + micrositeExtraMdFiles := Map( + file("CONTRIBUTING.md") -> ExtraMdFileConfig( + "contributing.md", + "home" + ) + ), micrositeGithubRepo := "cats", micrositePalette := Map( "brand-primary" -> "#5B5988", @@ -174,6 +179,7 @@ lazy val docSettings = Seq( "-sourcepath", baseDirectory.in(LocalRootProject).value.getAbsolutePath, "-diagrams" ), + scalacOptions in Tut ~= (_.filterNot(Set("-Ywarn-unused-import", "-Ywarn-dead-code"))), git.remoteRepo := "git@github.com:typelevel/cats.git", includeFilter in makeSite := "*.html" | "*.css" | "*.png" | "*.jpg" | "*.gif" | "*.js" | "*.swf" | "*.yml" | "*.md" | "*.svg", includeFilter in Jekyll := (includeFilter in makeSite).value @@ -185,9 +191,7 @@ lazy val docs = project .settings(catsSettings) .settings(noPublishSettings) .settings(unidocSettings) - .settings(ghpages.settings) .settings(docSettings) - .settings(tutScalacOptions ~= (_.filterNot(Set("-Ywarn-unused-import", "-Ywarn-dead-code")))) .settings(commonJvmSettings) .dependsOn(coreJVM, freeJVM) diff --git a/project/plugins.sbt b/project/plugins.sbt index 500d1b1c1b..abba44a56e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,6 +10,6 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19") addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.5.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") -addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.3.2") +addSbtPlugin("com.47deg" % "sbt-microsites" % "0.6.1") addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.1.0") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.0.0")