Skip to content

Commit f2c6e82

Browse files
Merge branch 'main' into update/scala-library-2.13.9
2 parents 4cccc00 + e9d7070 commit f2c6e82

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest]
31-
scala: [2.12.16, 2.13.8, 3.1.3]
31+
scala: [2.12.17, 2.13.8, 3.1.3]
3232
java: [temurin@8]
3333
project: [rootJS, rootJVM]
3434
runs-on: ${{ matrix.os }}
@@ -67,7 +67,7 @@ jobs:
6767
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
6868

6969
- name: Check that workflows are up to date
70-
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' 'project /' githubWorkflowCheck
70+
run: sbt githubWorkflowCheck
7171

7272
- name: Check headers and formatting
7373
if: matrix.java == 'temurin@8'
@@ -110,7 +110,7 @@ jobs:
110110
strategy:
111111
matrix:
112112
os: [ubuntu-latest]
113-
scala: [2.12.16]
113+
scala: [2.12.17]
114114
java: [temurin@8]
115115
runs-on: ${{ matrix.os }}
116116
steps:
@@ -147,22 +147,22 @@ jobs:
147147
~/Library/Caches/Coursier/v1
148148
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
149149

150-
- name: Download target directories (2.12.16, rootJS)
150+
- name: Download target directories (2.12.17, rootJS)
151151
uses: actions/download-artifact@v2
152152
with:
153-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootJS
153+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJS
154154

155-
- name: Inflate target directories (2.12.16, rootJS)
155+
- name: Inflate target directories (2.12.17, rootJS)
156156
run: |
157157
tar xf targets.tar
158158
rm targets.tar
159159
160-
- name: Download target directories (2.12.16, rootJVM)
160+
- name: Download target directories (2.12.17, rootJVM)
161161
uses: actions/download-artifact@v2
162162
with:
163-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootJVM
163+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM
164164

165-
- name: Inflate target directories (2.12.16, rootJVM)
165+
- name: Inflate target directories (2.12.17, rootJVM)
166166
run: |
167167
tar xf targets.tar
168168
rm targets.tar

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.5.8
1+
version = 3.5.9
22

33
runner.dialect = scala213
44

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ThisBuild / developers := List(
1212

1313
ThisBuild / tlSonatypeUseLegacyHost := false
1414

15-
val Scala212 = "2.12.16"
15+
val Scala212 = "2.12.17"
1616
val Scala213 = "2.13.8"
1717
val Scala3 = "3.1.3"
1818

@@ -27,7 +27,7 @@ ThisBuild / crossScalaVersions := Seq(
2727
lazy val root = tlCrossRootProject.aggregate(lib)
2828

2929
lazy val munitVersion = "0.7.29"
30-
lazy val scalacheckVersion = "1.16.0"
30+
lazy val scalacheckVersion = "1.17.0"
3131

3232
lazy val lib = crossProject(JVMPlatform, JSPlatform)
3333
.crossType(CrossType.Pure)

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.7.1
1+
sbt.version=1.7.2

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.4.13")
2-
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.13")
1+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.15")
2+
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.15")
33
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")

0 commit comments

Comments
 (0)