Skip to content
This repository was archived by the owner on Mar 3, 2025. It is now read-only.

Commit

Permalink
Merge branch 'main' into update/sbt-ci-release-1.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ybasket authored Jan 29, 2025
2 parents a14d4db + e719474 commit 9fd01dc
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.3.3]
scala: [3.3.4]
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.3.3]
scala: [3.3.4]
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -88,12 +88,12 @@ jobs:
- name: Setup sbt
uses: sbt/setup-sbt@v1

- name: Download target directories (3.3.3)
- name: Download target directories (3.3.4)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-3.3.3-${{ matrix.java }}
name: target-${{ matrix.os }}-3.3.4-${{ matrix.java }}

- name: Inflate target directories (3.3.3)
- name: Inflate target directories (3.3.4)
run: |
tar xf targets.tar
rm targets.tar
Expand All @@ -112,16 +112,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.3.3]
scala: [3.3.4]
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
- name: Download target directories (3.3.3)
- name: Download target directories (3.3.4)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-3.3.3-${{ matrix.java }}
name: target-${{ matrix.os }}-3.3.4-${{ matrix.java }}

- name: Inflate target directories (3.3.3)
- name: Inflate target directories (3.3.4)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "3.3.3"
ThisBuild / scalaVersion := "3.3.4"
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"))

// === Common settings used by all modules ===
Expand Down
8 changes: 4 additions & 4 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import sbt._

object Versions {
val fs2 = "3.10.2"
val fs2Data = "1.11.1"
val fs2 = "3.11.0"
val fs2Data = "1.11.2"
val enumeratum = "1.7.3"
val weaver = "0.8.4"
val circe = "0.14.8"
val circe = "0.14.10"
val log4cats = "2.7.0"
val catsParse = "1.0.0"
val catsParse = "1.1.0"
val literally = "1.2.0"
}

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.7
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ThisBuild / libraryDependencySchemes ++= Seq(
// strict compiler flags
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
// source code formatting
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
// coverage
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
// check dependencies against OWASP vulnerabilities
Expand Down

0 comments on commit 9fd01dc

Please sign in to comment.