From a9f903ab3ecc8b069af8590fafa8cd9a3dc97b1b Mon Sep 17 00:00:00 2001 From: Jens Halm <3116929+jenshalm@users.noreply.github.com> Date: Thu, 14 Sep 2023 01:46:42 +0100 Subject: [PATCH] update README and Laika plugin, adjust manual build --- README.md | 4 ++-- project/ManualSettings.scala | 13 ++++--------- project/plugins.sbt | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1af42d719..77416b91b 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Site and E-book Generator and Customizable Text Markup Transformer for sbt, Scal Latest Release -------------- -* The latest stable release is version **0.19.4**. +* The latest stable release is version **0.19.5**. * The latest milestone release is version **1.0.0-M4**. The library is published to Maven Central for Scala 3, 2.13, 2.12 and supports cats-effect 3.x and Scala.js 1.x. @@ -29,7 +29,7 @@ while the 1.0 milestones are now published under `org.typelevel`: // for version 0.19: addSbtPlugin("org.planet42" % "laika-sbt" % "0.19.4") -// for version 1.0.0: +// for version 1.0: addSbtPlugin("org.typelevel" % "laika-sbt" % "1.0.0-M4") ``` diff --git a/project/ManualSettings.scala b/project/ManualSettings.scala index 7ba0930fc..2b4619905 100644 --- a/project/ManualSettings.scala +++ b/project/ManualSettings.scala @@ -12,7 +12,7 @@ import laika.helium.config.{ TextLink, VersionMenu } -import laika.rewrite.link.{ ApiLinks, LinkConfig } +import laika.rewrite.link.{ ApiLinks, LinkConfig, LinkValidation } import laika.rewrite.{ Version, Versions } import laika.rewrite.nav.{ ChoiceConfig, CoverImage, SelectionConfig, Selections } import laika.sbt.LaikaConfig @@ -125,15 +125,10 @@ object ManualSettings { } + // TODO - api links will not work on top level pages, but fine for now - change to absolute path val config: LaikaConfig = LaikaConfig.defaults - .withConfigValue( - LinkConfig( - apiLinks = Seq( - ApiLinks("../api/") - ), // TODO - will not work on top level pages, but fine for now - change to absolute path - excludeFromValidation = Seq(Root / "api") // TODO - adjust once 0.19.4 is out - ) - ) + .withConfigValue(LinkConfig.empty.addApiLinks(ApiLinks("../api/"))) + .withConfigValue(LinkValidation.Global(Seq(Root / "api"))) .withConfigValue( Selections( SelectionConfig( diff --git a/project/plugins.sbt b/project/plugins.sbt index 8874f4b17..b92422d4e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,6 +10,6 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") -addSbtPlugin("org.planet42" % "laika-sbt" % "0.19.3") +addSbtPlugin("org.planet42" % "laika-sbt" % "0.19.5") addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.2")