Skip to content

Commit 4a75b54

Browse files
authored
Merge branch 'main' into update/jsoniter-scala-core-2.27.7
Signed-off-by: Andreas Rigas <[email protected]>
2 parents 5d8a515 + ca2ac51 commit 4a75b54

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Scala Steward: Reformat with scalafmt 3.8.1
2+
27310de4427f3187d2a4fca19f296ea7b2cae311

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ jobs:
285285
strategy:
286286
matrix:
287287
os: [ubuntu-latest]
288-
scala: [3.3.1]
288+
scala: [3.3.3]
289289
java: [temurin@11]
290290
runs-on: ${{ matrix.os }}
291291
steps:
@@ -313,7 +313,7 @@ jobs:
313313
strategy:
314314
matrix:
315315
os: [ubuntu-latest]
316-
scala: [3.3.1]
316+
scala: [3.3.3]
317317
java: [temurin@11]
318318
runs-on: ${{ matrix.os }}
319319
steps:

.scalafmt.conf

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

33
runner.dialect = scala3
44
maxColumn = 120

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.typelevel.sbt.gha.Permissions
22

33
Global / onChangedBuildSource := ReloadOnSourceChanges
44

5-
ThisBuild / scalaVersion := "3.3.1"
5+
ThisBuild / scalaVersion := "3.3.3"
66
ThisBuild / organization := "io.github.scala-jwt"
77
ThisBuild / organizationName := "oath"
88
ThisBuild / organizationHomepage := Some(url("https://github.com/scala-jwt/oath"))
@@ -54,7 +54,7 @@ lazy val root = Projects
5454
.createModule("oath", ".")
5555
.enablePlugins(NoPublishPlugin)
5656
.settings(Aliases.all)
57-
.aggregate(modules*)
57+
.aggregate(modules *)
5858

5959
lazy val oathMacros = Projects
6060
.createModule("oath-macros", "modules/oath-macros")

project/Dependencies.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import sbt.Keys.*
44
object Dependencies {
55

66
object Versions {
7-
val scalaTest = "3.2.17"
7+
val scalaTest = "3.2.18"
88
val scalaTestPlusCheck = "3.2.17.0"
9-
val scalacheck = "1.17.0"
9+
val scalacheck = "1.17.1"
1010
val javaJWT = "4.4.0"
1111
val config = "1.4.3"
12-
val bcprov = "1.77"
13-
val circe = "0.14.6"
12+
val bcprov = "1.78.1"
13+
val circe = "0.14.7"
1414
val jsoniterScala = "2.27.7"
1515
}
1616

project/build.properties

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

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
22
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
3-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
3+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
44
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0")
5-
addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.6.5")
5+
addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.6.7")

0 commit comments

Comments
 (0)