diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7ff1da..3d86faa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.8, 3.2.0] + scala: [2.13.10, 3.2.0] java: [temurin@11] project: [rootJVM] runs-on: ${{ matrix.os }} @@ -62,7 +62,7 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Check that workflows are up to date - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' 'project /' githubWorkflowCheck + run: sbt githubWorkflowCheck - name: Check headers and formatting if: matrix.java == 'temurin@11' @@ -101,7 +101,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.8] + scala: [2.13.10] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -138,12 +138,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.13.8, rootJVM) + - name: Download target directories (2.13.10, rootJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM - - name: Inflate target directories (2.13.8, rootJVM) + - name: Inflate target directories (2.13.10, rootJVM) run: | tar xf targets.tar rm targets.tar @@ -188,7 +188,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.8] + scala: [2.13.10] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -233,7 +233,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.8] + scala: [2.13.10] java: [temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 093c869..43ecd10 100644 --- a/build.sbt +++ b/build.sbt @@ -22,7 +22,7 @@ ThisBuild / tlCiReleaseBranches := Seq("main") // use JDK 11 ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")) -val Scala213 = "2.13.8" +val Scala213 = "2.13.10" ThisBuild / crossScalaVersions := Seq(Scala213, "3.2.0") ThisBuild / scalaVersion := Scala213 // the default Scala @@ -55,17 +55,34 @@ lazy val example = project .enablePlugins(NoPublishPlugin) .dependsOn(lucene) +import laika.ast.Path.Root +import laika.helium.config.{IconLink, HeliumIcon, TextLink, ThemeNavigationSection} +import cats.data.NonEmptyList lazy val docs = project .in(file("site")) .enablePlugins(TypelevelSitePlugin) .dependsOn(lucene) .settings( tlSiteApiPackage := Some("textmogrify"), - tlSiteRelatedProjects := Seq( - "lucene" -> url("https://lucene.apache.org/"), - TypelevelProject.CatsEffect, - TypelevelProject.Fs2, - ), + tlSiteHelium := { + tlSiteHelium.value.site.darkMode.disabled.site + .topNavigationBar( + homeLink = IconLink.external("https://github.com/valencik/textmogrify", HeliumIcon.home) + ) + .site + .mainNavigation( + appendLinks = Seq( + ThemeNavigationSection( + "Related Projects", + NonEmptyList.of( + TextLink.external("https://lucene.apache.org/", "lucene"), + TextLink.external("https://typelevel.org/cats-effect/", "cats-effect"), + TextLink.external("https://fs2.io/", "fs2"), + ), + ) + ) + ) + }, ) lazy val unidocs = project diff --git a/docs/default.template.html b/docs/default.template.html deleted file mode 100644 index 77cb513..0000000 --- a/docs/default.template.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - ${cursor.currentDocument.title} - @:for(laika.site.metadata.authors) - - @:@ - @:for(laika.site.metadata.description) - - @:@ - @:for(helium.favIcons) - - @:@ - @:for(helium.webFonts) - - @:@ - @:linkCSS { paths = ${helium.site.includeCSS} } - @:linkJS { paths = ${helium.site.includeJS} } - @:heliumInitVersions - @:heliumInitPreview(container) - - - - - -
- -
- - @:icon(navigationMenu) - - @:for(laika.versions) - - @:@ -
- - - - ${?helium.topBar.links} - -
- - - -
- - - -
- - ${cursor.currentDocument.content} - -
- - -
- -
- - - diff --git a/project/plugins.sbt b/project/plugins.sbt index 109da51..7211813 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-M5") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-M5") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-M6") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-M6") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")