Merge pull request #646 from jenshalm/update/laika-1.0

migrate to Laika 1.0.0
typelevel · Oct 18, 2023 · 025e93e · 025e93e
2 parents 892e362 + a4b6e0f
commit 025e93e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ name := "sbt-typelevel"
 
 import org.typelevel.sbt.gha.{PermissionScope, PermissionValue, Permissions}
 
-ThisBuild / tlBaseVersion := "0.5"
+ThisBuild / tlBaseVersion := "0.6"
 ThisBuild / crossScalaVersions := Seq("2.12.18")
 ThisBuild / developers ++= List(
   tlGitHubDev("armanbilge", "Arman Bilge"),

diff --git a/site/build.sbt b/site/build.sbt
@@ -1,2 +1,2 @@
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
-addSbtPlugin("org.planet42" % "laika-sbt" % "0.19.5")
+addSbtPlugin("org.typelevel" % "laika-sbt" % "1.0.0")
diff --git a/site/src/main/scala/org/typelevel/sbt/site/GenericSiteSettings.scala b/site/src/main/scala/org/typelevel/sbt/site/GenericSiteSettings.scala
@@ -57,9 +57,12 @@ object GenericSiteSettings {
   @nowarn("cat=deprecation")
   private val legacyRelatedProjects: Initialize[Option[ThemeNavigationSection]] = setting {
     NonEmptyList.fromList(tlSiteRelatedProjects.value.toList).map { projects =>
+      val links = projects.map { case (name, url) => TextLink.external(url.toString, name) }
       ThemeNavigationSection(
         "Related Projects",
-        projects.map { case (name, url) => TextLink.external(url.toString, name) })
+        links.head,
+        links.tail*
+      )
     }
   }
 

diff --git a/site/src/main/scala/org/typelevel/sbt/site/TypelevelHeliumExtensions.scala b/site/src/main/scala/org/typelevel/sbt/site/TypelevelHeliumExtensions.scala
@@ -19,10 +19,10 @@ package org.typelevel.sbt.site
 import cats.effect.Async
 import cats.effect.kernel.Resource
 import laika.ast.Path
+import laika.config.SyntaxHighlighting
+import laika.format.Markdown.GitHubFlavor
 import laika.io.model.InputTree
-import laika.markdown.github.GitHubFlavor
-import laika.parse.code.SyntaxHighlighting
-import laika.parse.code.languages.DottySyntax
+import laika.parse.code.languages.ScalaSyntax
 import laika.theme.Theme
 import laika.theme.ThemeBuilder
 import laika.theme.ThemeProvider
@@ -70,7 +70,7 @@ object TypelevelHeliumExtensions {
         )
         .addExtensions(
           GitHubFlavor,
-          if (scala3) SyntaxHighlighting.withSyntaxBinding("scala", DottySyntax)
+          if (scala3) SyntaxHighlighting.withSyntaxBinding("scala", ScalaSyntax.Scala3)
           else SyntaxHighlighting
         )
         .build