Skip to content

Commit

Permalink
Merge pull request #52 from valencik/scala2310
Browse files Browse the repository at this point in the history
Update to Scala 2.13.10 and sbt-typelevel 0.5.0-M6
  • Loading branch information
valencik authored Oct 21, 2022
2 parents f05bc0d + 9b2664f commit 39bc49a
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 122 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
29 changes: 23 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
106 changes: 0 additions & 106 deletions docs/default.template.html

This file was deleted.

4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit 39bc49a

Please sign in to comment.