Skip to content

Commit 60805a1

Browse files
author
scala-steward
committed
Merge branch 'master' into update/armeria-1.24.3
2 parents 166dd87 + 9de8fee commit 60805a1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ val fs2_2_version: Option[(Long, Long)] => String = {
1919
case Some((2, 11)) => "2.1.0"
2020
case _ => "2.5.9"
2121
}
22-
val fs2_3_version = "3.7.0"
22+
val fs2_3_version = "3.8.0"
2323
val armeriaVersion = "1.24.2"
2424

2525
excludeLintKeys in Global ++= Set(ideSkipProject)
@@ -153,7 +153,7 @@ lazy val pekko = (projectMatrix in file("pekko"))
153153
.jvmPlatform(
154154
scalaVersions = scala2alive ++ scala3,
155155
settings = commonJvmSettings ++ Seq(
156-
libraryDependencies += "org.apache.pekko" %% "pekko-stream" % "1.0.0" % "provided"
156+
libraryDependencies += "org.apache.pekko" %% "pekko-stream" % "1.0.1" % "provided"
157157
)
158158
)
159159
.dependsOn(core)

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
33
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
44
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.1")
55

6-
val sbtSoftwareMillVersion = "2.0.12"
6+
val sbtSoftwareMillVersion = "2.0.13"
77
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwareMillVersion)
88
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion)
99
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-browser-test-js" % sbtSoftwareMillVersion)

0 commit comments

Comments
 (0)