Skip to content

Commit 7775504

Browse files
committed
Merge branch 'series/0.6.x'
2 parents 5de9955 + cbcb6d1 commit 7775504

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

.github/workflows/ci.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ concurrency:
2424

2525
jobs:
2626
build:
27-
name: Build and Test
27+
name: Test
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest]
@@ -34,14 +34,14 @@ jobs:
3434
runs-on: ${{ matrix.os }}
3535
timeout-minutes: 60
3636
steps:
37-
- name: Install sbt
38-
uses: sbt/setup-sbt@v1
39-
4037
- name: Checkout current branch (full)
4138
uses: actions/checkout@v4
4239
with:
4340
fetch-depth: 0
4441

42+
- name: Setup sbt
43+
uses: sbt/setup-sbt@v1
44+
4545
- name: Setup Java (temurin@11)
4646
id: setup-java-temurin-11
4747
if: matrix.java == 'temurin@11'
@@ -116,14 +116,14 @@ jobs:
116116
java: [temurin@11]
117117
runs-on: ${{ matrix.os }}
118118
steps:
119-
- name: Install sbt
120-
uses: sbt/setup-sbt@v1
121-
122119
- name: Checkout current branch (full)
123120
uses: actions/checkout@v4
124121
with:
125122
fetch-depth: 0
126123

124+
- name: Setup sbt
125+
uses: sbt/setup-sbt@v1
126+
127127
- name: Setup Java (temurin@11)
128128
id: setup-java-temurin-11
129129
if: matrix.java == 'temurin@11'
@@ -232,18 +232,18 @@ jobs:
232232
if: github.event.repository.fork == false && github.event_name != 'pull_request'
233233
strategy:
234234
matrix:
235-
os: [ubuntu-latest]
235+
os: [ubuntu-22.04]
236236
java: [temurin@11]
237237
runs-on: ${{ matrix.os }}
238238
steps:
239-
- name: Install sbt
240-
uses: sbt/setup-sbt@v1
241-
242239
- name: Checkout current branch (full)
243240
uses: actions/checkout@v4
244241
with:
245242
fetch-depth: 0
246243

244+
- name: Setup sbt
245+
uses: sbt/setup-sbt@v1
246+
247247
- name: Setup Java (temurin@11)
248248
id: setup-java-temurin-11
249249
if: matrix.java == 'temurin@11'
@@ -273,18 +273,18 @@ jobs:
273273
name: Generate Site
274274
strategy:
275275
matrix:
276-
os: [ubuntu-latest]
276+
os: [ubuntu-22.04]
277277
java: [temurin@11]
278278
runs-on: ${{ matrix.os }}
279279
steps:
280-
- name: Install sbt
281-
uses: sbt/setup-sbt@v1
282-
283280
- name: Checkout current branch (full)
284281
uses: actions/checkout@v4
285282
with:
286283
fetch-depth: 0
287284

285+
- name: Setup sbt
286+
uses: sbt/setup-sbt@v1
287+
288288
- name: Setup Java (temurin@11)
289289
id: setup-java-temurin-11
290290
if: matrix.java == 'temurin@11'
@@ -319,18 +319,18 @@ jobs:
319319
name: Generate coverage report (2.13 JVM only)
320320
strategy:
321321
matrix:
322-
os: [ubuntu-latest]
322+
os: [ubuntu-22.04]
323323
java: [temurin@11]
324324
runs-on: ${{ matrix.os }}
325325
steps:
326-
- name: Install sbt
327-
uses: sbt/setup-sbt@v1
328-
329326
- name: Checkout current branch (full)
330327
uses: actions/checkout@v4
331328
with:
332329
fetch-depth: 0
333330

331+
- name: Setup sbt
332+
uses: sbt/setup-sbt@v1
333+
334334
- name: Setup Java (temurin@11)
335335
id: setup-java-temurin-11
336336
if: matrix.java == 'temurin@11'

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
111111
description := "Tagless, non-blocking data access library for Postgres.",
112112
libraryDependencies ++= Seq(
113113
"org.typelevel" %%% "cats-core" % "2.11.0",
114-
"org.typelevel" %%% "cats-effect" % "3.5.6",
114+
"org.typelevel" %%% "cats-effect" % "3.5.7",
115115
"co.fs2" %%% "fs2-core" % fs2Version,
116116
"co.fs2" %%% "fs2-io" % fs2Version,
117117
"org.scodec" %%% "scodec-bits" % "1.1.38",
@@ -183,12 +183,12 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
183183
tlFatalWarnings := false,
184184
libraryDependencies ++= Seq(
185185
"org.scalameta" %%% "munit" % "1.0.0",
186-
"org.scalameta" % "junit-interface" % "1.0.2",
186+
"org.scalameta" % "junit-interface" % "1.0.4",
187187
"org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0-M2",
188188
"org.typelevel" %%% "munit-cats-effect" % "2.0.0",
189189
"org.typelevel" %%% "cats-free" % "2.11.0",
190190
"org.typelevel" %%% "cats-laws" % "2.11.0",
191-
"org.typelevel" %%% "cats-effect-testkit" % "3.5.6",
191+
"org.typelevel" %%% "cats-effect-testkit" % "3.5.7",
192192
"org.typelevel" %%% "discipline-munit" % "2.0.0-M3",
193193
"org.typelevel" %%% "cats-time" % "0.5.1",
194194
"eu.timepit" %%% "refined-cats" % refinedVersion,

project/build.properties

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

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ ThisBuild / libraryDependencySchemes ++= Seq(
33
"org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
44
)
55

6-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4")
6+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.5")
77
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.4")
88
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
99
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
1010
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2")
11-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
11+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
1212
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
1313
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.3.0")

0 commit comments

Comments
 (0)