Skip to content

Commit 39bc49a

Browse files
authored
Merge pull request #52 from valencik/scala2310
Update to Scala 2.13.10 and sbt-typelevel 0.5.0-M6
2 parents f05bc0d + 9b2664f commit 39bc49a

File tree

4 files changed

+33
-122
lines changed

4 files changed

+33
-122
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
os: [ubuntu-latest]
26-
scala: [2.13.8, 3.2.0]
26+
scala: [2.13.10, 3.2.0]
2727
java: [temurin@11]
2828
project: [rootJVM]
2929
runs-on: ${{ matrix.os }}
@@ -62,7 +62,7 @@ jobs:
6262
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
6363

6464
- name: Check that workflows are up to date
65-
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' 'project /' githubWorkflowCheck
65+
run: sbt githubWorkflowCheck
6666

6767
- name: Check headers and formatting
6868
if: matrix.java == 'temurin@11'
@@ -101,7 +101,7 @@ jobs:
101101
strategy:
102102
matrix:
103103
os: [ubuntu-latest]
104-
scala: [2.13.8]
104+
scala: [2.13.10]
105105
java: [temurin@11]
106106
runs-on: ${{ matrix.os }}
107107
steps:
@@ -138,12 +138,12 @@ jobs:
138138
~/Library/Caches/Coursier/v1
139139
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
140140

141-
- name: Download target directories (2.13.8, rootJVM)
141+
- name: Download target directories (2.13.10, rootJVM)
142142
uses: actions/download-artifact@v3
143143
with:
144-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJVM
144+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM
145145

146-
- name: Inflate target directories (2.13.8, rootJVM)
146+
- name: Inflate target directories (2.13.10, rootJVM)
147147
run: |
148148
tar xf targets.tar
149149
rm targets.tar
@@ -188,7 +188,7 @@ jobs:
188188
strategy:
189189
matrix:
190190
os: [ubuntu-latest]
191-
scala: [2.13.8]
191+
scala: [2.13.10]
192192
java: [temurin@11]
193193
runs-on: ${{ matrix.os }}
194194
steps:
@@ -233,7 +233,7 @@ jobs:
233233
strategy:
234234
matrix:
235235
os: [ubuntu-latest]
236-
scala: [2.13.8]
236+
scala: [2.13.10]
237237
java: [temurin@11]
238238
runs-on: ${{ matrix.os }}
239239
steps:

build.sbt

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ThisBuild / tlCiReleaseBranches := Seq("main")
2222
// use JDK 11
2323
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"))
2424

25-
val Scala213 = "2.13.8"
25+
val Scala213 = "2.13.10"
2626
ThisBuild / crossScalaVersions := Seq(Scala213, "3.2.0")
2727
ThisBuild / scalaVersion := Scala213 // the default Scala
2828

@@ -55,17 +55,34 @@ lazy val example = project
5555
.enablePlugins(NoPublishPlugin)
5656
.dependsOn(lucene)
5757

58+
import laika.ast.Path.Root
59+
import laika.helium.config.{IconLink, HeliumIcon, TextLink, ThemeNavigationSection}
60+
import cats.data.NonEmptyList
5861
lazy val docs = project
5962
.in(file("site"))
6063
.enablePlugins(TypelevelSitePlugin)
6164
.dependsOn(lucene)
6265
.settings(
6366
tlSiteApiPackage := Some("textmogrify"),
64-
tlSiteRelatedProjects := Seq(
65-
"lucene" -> url("https://lucene.apache.org/"),
66-
TypelevelProject.CatsEffect,
67-
TypelevelProject.Fs2,
68-
),
67+
tlSiteHelium := {
68+
tlSiteHelium.value.site.darkMode.disabled.site
69+
.topNavigationBar(
70+
homeLink = IconLink.external("https://github.com/valencik/textmogrify", HeliumIcon.home)
71+
)
72+
.site
73+
.mainNavigation(
74+
appendLinks = Seq(
75+
ThemeNavigationSection(
76+
"Related Projects",
77+
NonEmptyList.of(
78+
TextLink.external("https://lucene.apache.org/", "lucene"),
79+
TextLink.external("https://typelevel.org/cats-effect/", "cats-effect"),
80+
TextLink.external("https://fs2.io/", "fs2"),
81+
),
82+
)
83+
)
84+
)
85+
},
6986
)
7087

7188
lazy val unidocs = project

docs/default.template.html

Lines changed: 0 additions & 106 deletions
This file was deleted.

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-M5")
2-
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-M5")
1+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-M6")
2+
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-M6")
33
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")

0 commit comments

Comments
 (0)