Skip to content

Commit 425a1a5

Browse files
authored
Merge origin/main into update/sbt-github-actions-0.31.0
2 parents 880d568 + 1fa06a6 commit 425a1a5

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest]
31-
scala: [3.8.3]
31+
scala: [3.8.4]
3232
java: [temurin@21]
3333
runs-on: ${{ matrix.os }}
3434
steps:
@@ -75,7 +75,7 @@ jobs:
7575
strategy:
7676
matrix:
7777
os: [ubuntu-latest]
78-
scala: [3.8.3]
78+
scala: [3.8.4]
7979
java: [temurin@21]
8080
runs-on: ${{ matrix.os }}
8181
steps:
@@ -95,12 +95,12 @@ jobs:
9595
- name: Setup sbt
9696
uses: sbt/setup-sbt@v1
9797

98-
- name: Download target directories (3.8.3)
98+
- name: Download target directories (3.8.4)
9999
uses: actions/download-artifact@v8
100100
with:
101-
name: target-${{ matrix.os }}-3.8.3-${{ matrix.java }}
101+
name: target-${{ matrix.os }}-3.8.4-${{ matrix.java }}
102102

103-
- name: Inflate target directories (3.8.3)
103+
- name: Inflate target directories (3.8.4)
104104
run: |
105105
tar xf targets.tar
106106
rm targets.tar

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import java.time.LocalDate
22

33
ThisBuild / dynverSeparator := "-" // Default uses '+' which is not valid for docker tags
4-
ThisBuild / scalaVersion := "3.8.3"
4+
ThisBuild / scalaVersion := "3.8.4"
55

66
addCommandAlias("codeFmt", ";headerCreate;scalafmtAll;scalafmtSbt;scalafixAll")
77
addCommandAlias("codeVerify", ";scalafmtCheckAll;scalafmtSbtCheck;scalafixAll --check;headerCheck")

project/Dependencies.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ import sbt._
22

33
object Dependencies {
44

5-
private val circeVersion = "0.14.15"
5+
private val circeVersion = "0.14.16"
66
private val fs2Version = "3.13.0"
77
private val sttpClientVersion = "3.11.0"
88

99
val core: Seq[ModuleID] = Seq(
10-
"ch.qos.logback" % "logback-classic" % "1.5.34",
10+
"ch.qos.logback" % "logback-classic" % "1.5.37",
1111
"co.fs2" %% "fs2-io" % fs2Version,
1212
"co.fs2" %% "fs2-core" % fs2Version,
13-
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % "2.21.4",
13+
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % "2.22.0",
1414
"com.monovore" %% "decline-effect" % "2.6.2",
1515
"com.softwaremill.sttp.client3" %% "core" % sttpClientVersion,
1616
"com.softwaremill.sttp.client3" %% "circe" % sttpClientVersion,
1717
"com.softwaremill.sttp.client3" %% "async-http-client-backend-cats" % sttpClientVersion,
18-
"com.typesafe" % "config" % "1.4.8",
18+
"com.typesafe" % "config" % "1.4.9",
1919
"io.circe" %% "circe-core" % circeVersion,
2020
"io.circe" %% "circe-parser" % circeVersion,
2121
"io.circe" %% "circe-yaml" % "1.15.0",

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.6")
1+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.7")
22
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.31.0")
33
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
44
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.7")

0 commit comments

Comments
 (0)