From a1598a4bbc9c56be5329ff13b511361149a8357d Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Wed, 18 Dec 2019 08:36:08 -0600 Subject: [PATCH 1/3] Update sbt-microsites to 1.0 (but keep using Tut) --- build.sbt | 1 + project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0727937d91..0fca2d751e 100644 --- a/build.sbt +++ b/build.sbt @@ -196,6 +196,7 @@ lazy val docSettings = Seq( "gray-lighter" -> "#F4F3F4", "white-color" -> "#FFFFFF" ), + micrositeCompilingDocsTool := WithTut, autoAPIMappings := true, unidocProjectFilter in (ScalaUnidoc, unidoc) := inProjects(kernel.jvm, core.jvm, free.jvm), docsMappingsAPIDir := "api", diff --git a/project/plugins.sbt b/project/plugins.sbt index 093a990553..02b816b7ff 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0") addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.9.5") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1") -addSbtPlugin("com.47deg" % "sbt-microsites" % "0.9.7") +addSbtPlugin("com.47deg" % "sbt-microsites" % "1.0.2") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.13") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1") From 350a976a54b0759d5ad7656be8b09a927fd0fda9 Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Wed, 18 Dec 2019 09:00:38 -0600 Subject: [PATCH 2/3] Use pre-1.0 microsite theme --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 0fca2d751e..e321ca2aa7 100644 --- a/build.sbt +++ b/build.sbt @@ -186,6 +186,7 @@ lazy val docSettings = Seq( ) ), micrositeGithubRepo := "cats", + micrositeTheme := "pattern", micrositePalette := Map( "brand-primary" -> "#5B5988", "brand-secondary" -> "#292E53", From ae0ab9bb026c453db58c9a21cc64d7273fb5a4e5 Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Wed, 18 Dec 2019 09:00:51 -0600 Subject: [PATCH 3/3] Update Jekyll in Travis CI config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 92cc94d8e2..5031b27cfe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ jobs: - stage: test env: TEST="docs" - install: gem install jekyll -v 2.5 + install: gem install jekyll -v 4.0.0 script: sbt docs/makeMicrosite - stage: test