From 9d37b953fe1a85a4954ffefd3432f94ad76cb5f0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 20 Oct 2022 05:10:29 +0000 Subject: [PATCH 1/8] Update scala-library to 2.13.10 --- .github/workflows/ci.yml | 8 ++++---- build.sbt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7ff1da..5b1e8c3 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 }} @@ -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: @@ -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 a96b2c9..3f91a3e 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 From 5604fcb9cd7aa63e6d088a92d07bda4075e2e1f2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 20 Oct 2022 05:11:09 +0000 Subject: [PATCH 2/8] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b1e8c3..c584519 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 From 83bf537da61e2268c40b8686f519085f858a10c6 Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Thu, 20 Oct 2022 21:43:38 -0400 Subject: [PATCH 3/8] Update sbt-typelevel to 0.5.0-M6 --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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") From d42342de43be2ed15d7b701870e7be254e02df74 Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Thu, 20 Oct 2022 21:43:56 -0400 Subject: [PATCH 4/8] Regenerate workflows --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c584519..3d86faa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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' From 7f953dc2686bc4ef3af593877535c495e561b601 Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Thu, 20 Oct 2022 22:09:55 -0400 Subject: [PATCH 5/8] Remove old template --- docs/default.template.html | 106 ------------------------------------- 1 file changed, 106 deletions(-) delete mode 100644 docs/default.template.html 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} - -
- - -
- -
- - - From aa74e9d1b4e259d2d8ca9e2ae3f967a6860f8414 Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Thu, 20 Oct 2022 22:20:03 -0400 Subject: [PATCH 6/8] Disable site darkMode --- build.sbt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sbt b/build.sbt index 3f91a3e..1d078d6 100644 --- a/build.sbt +++ b/build.sbt @@ -66,6 +66,9 @@ lazy val docs = project TypelevelProject.CatsEffect, TypelevelProject.Fs2, ), + tlSiteHelium := { + tlSiteHelium.value.site.darkMode.disabled + }, ) lazy val unidocs = project From 1b0537b53cad243359b710775b0c2ead413a7e6a Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Thu, 20 Oct 2022 22:32:07 -0400 Subject: [PATCH 7/8] Add homeLink in topNavigationBar --- build.sbt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1d078d6..5481f07 100644 --- a/build.sbt +++ b/build.sbt @@ -55,6 +55,8 @@ lazy val example = project .enablePlugins(NoPublishPlugin) .dependsOn(lucene) +import laika.ast.Path.Root +import laika.helium.config.{IconLink, HeliumIcon} lazy val docs = project .in(file("site")) .enablePlugins(TypelevelSitePlugin) @@ -67,7 +69,9 @@ lazy val docs = project TypelevelProject.Fs2, ), tlSiteHelium := { - tlSiteHelium.value.site.darkMode.disabled + tlSiteHelium.value.site.darkMode.disabled.site.topNavigationBar( + homeLink = IconLink.external("https://github.com/valencik/textmogrify", HeliumIcon.home) + ) }, ) From 9b2664f62453d1865dab7ebcc50c17b659cf7684 Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Fri, 21 Oct 2022 08:01:54 -0400 Subject: [PATCH 8/8] Rebuild related projects section, fix deprecation --- build.sbt | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 5481f07..fb1ca0e 100644 --- a/build.sbt +++ b/build.sbt @@ -56,22 +56,32 @@ lazy val example = project .dependsOn(lucene) import laika.ast.Path.Root -import laika.helium.config.{IconLink, HeliumIcon} +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) - ) + 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"), + ), + ) + ) + ) }, )