Skip to content

Commit 6d3b73d

Browse files
authored
Merge branch 'main' into update/sbt-scalafmt-2.6.0
2 parents d5c7725 + 14b428a commit 6d3b73d

5 files changed

Lines changed: 11 additions & 10 deletions

File tree

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33

44
# Scala Steward: Reformat with scalafmt 3.10.3
55
d8af028d2cd271ab7f3adec9842f07cce86a2ac3
6+
7+
# Scala Steward: Reformat with scalafmt 3.10.7
8+
83b819003b44835b1792e3ef8263da91a5b6d4ba

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v6
19-
- uses: dorny/paths-filter@v3
19+
- uses: dorny/paths-filter@v4
2020
id: changes
2121
with:
2222
filters: |

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.10.3
1+
version = 3.10.7
22
project.layout = StandardConvention
33
runner.dialect = scala3
44
maxColumn = 100

build.sbt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
33
// For performance testing, ensure each test run one-by-one
44
Global / concurrentRestrictions := Seq(Tags.limit(Tags.Test, 1))
55

6-
val AIRFRAME_VERSION = "2025.1.22"
6+
val AIRFRAME_VERSION = "2025.1.27"
77

88
// Use dynamic snapshot version strings for non tagged versions
99
ThisBuild / dynverSonatypeSnapshots := true
@@ -92,13 +92,11 @@ val buildSettings = Seq[Setting[?]](
9292
// Style check config: (sbt-jchekcstyle)
9393
jcheckStyleConfig := "facebook",
9494
// Run jcheckstyle both for main and test codes
95-
Compile / compile :=
96-
((Compile / compile) dependsOn (Compile / jcheckStyle)).value,
97-
Test / compile :=
98-
((Test / compile) dependsOn (Test / jcheckStyle)).value
95+
Compile / compile := ((Compile / compile) dependsOn (Compile / jcheckStyle)).value,
96+
Test / compile := ((Test / compile) dependsOn (Test / jcheckStyle)).value
9997
)
10098

101-
val junitJupiter = "org.junit.jupiter" % "junit-jupiter" % "5.14.1" % "test"
99+
val junitJupiter = "org.junit.jupiter" % "junit-jupiter" % "5.14.4" % "test"
102100
val junitVintage = "org.junit.vintage" % "junit-vintage-engine" % "5.14.1" % "test"
103101

104102
// Project settings
@@ -163,7 +161,7 @@ lazy val msgpackJackson = Project(id = "msgpack-jackson", base = file("msgpack-j
163161
OsgiKeys.exportPackage := Seq("org.msgpack.jackson", "org.msgpack.jackson.dataformat"),
164162
libraryDependencies ++=
165163
Seq(
166-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.18.4",
164+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.20.0",
167165
junitJupiter,
168166
junitVintage,
169167
"org.apache.commons" % "commons-math3" % "3.6.1" % "test"

project/build.properties

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

0 commit comments

Comments
 (0)