Skip to content

Commit d4cb826

Browse files
authored
Merge branch 'main' into patch-2
2 parents 8463ae0 + 4271587 commit d4cb826

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ name: Continuous Integration
99

1010
on:
1111
pull_request:
12-
branches: ['**']
12+
branches: ['**', '!update/**', '!pr/**']
1313
push:
14-
branches: ['**']
14+
branches: ['**', '!update/**', '!pr/**']
1515
tags: [v*]
1616

1717
env:
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest]
31-
scala: [3.1.0, 2.12.15, 2.13.8]
31+
scala: [3.1.3, 2.12.16, 2.13.8]
3232
java: [temurin@8]
3333
project: [rootJS, rootJVM]
3434
runs-on: ${{ matrix.os }}
@@ -147,42 +147,42 @@ 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 (3.1.0, rootJS)
150+
- name: Download target directories (3.1.3, rootJS)
151151
uses: actions/download-artifact@v2
152152
with:
153-
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.0-rootJS
153+
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.3-rootJS
154154

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

165-
- name: Inflate target directories (3.1.0, rootJVM)
165+
- name: Inflate target directories (3.1.3, rootJVM)
166166
run: |
167167
tar xf targets.tar
168168
rm targets.tar
169169
170-
- name: Download target directories (2.12.15, rootJS)
170+
- name: Download target directories (2.12.16, rootJS)
171171
uses: actions/download-artifact@v2
172172
with:
173-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15-rootJS
173+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootJS
174174

175-
- name: Inflate target directories (2.12.15, rootJS)
175+
- name: Inflate target directories (2.12.16, rootJS)
176176
run: |
177177
tar xf targets.tar
178178
rm targets.tar
179179
180-
- name: Download target directories (2.12.15, rootJVM)
180+
- name: Download target directories (2.12.16, rootJVM)
181181
uses: actions/download-artifact@v2
182182
with:
183-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15-rootJVM
183+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootJVM
184184

185-
- name: Inflate target directories (2.12.15, rootJVM)
185+
- name: Inflate target directories (2.12.16, rootJVM)
186186
run: |
187187
tar xf targets.tar
188188
rm targets.tar

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ThisBuild / tlBaseVersion := "2.0"
33
ThisBuild / developers += tlGitHubDev("mpilquist", "Michael Pilquist")
44
ThisBuild / startYear := Some(2021)
55

6-
ThisBuild / crossScalaVersions := List("3.1.0", "2.12.15", "2.13.8")
6+
ThisBuild / crossScalaVersions := List("3.1.3", "2.12.16", "2.13.8")
77
ThisBuild / tlVersionIntroduced := Map("3" -> "1.0.2")
88

99
lazy val root = tlCrossRootProject.aggregate(core, munit)
@@ -16,7 +16,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
1616
.settings(
1717
libraryDependencies ++= List(
1818
"org.scalacheck" %%% "scalacheck" % "1.16.0",
19-
"org.typelevel" %%% "cats-core" % "2.7.0"
19+
"org.typelevel" %%% "cats-core" % "2.8.0"
2020
)
2121
)
2222

@@ -29,6 +29,6 @@ lazy val munit = crossProject(JSPlatform, JVMPlatform)
2929
.settings(
3030
libraryDependencies ++= List(
3131
"org.scalameta" %%% "munit-scalacheck" % "1.0.0-M6",
32-
"org.typelevel" %%% "cats-effect" % "3.3.11" % Test
32+
"org.typelevel" %%% "cats-effect" % "3.3.14" % Test
3333
)
3434
)

project/build.properties

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

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0")
2-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.9")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
2+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.13")

0 commit comments

Comments
 (0)