Skip to content

Commit 2d443d1

Browse files
author
scala-steward
committed
Merge branch 'master' into update/armeria-1.25.2
2 parents a5328b8 + 8b60bc7 commit 2d443d1

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
runner.dialect = scala3
2-
version = 3.7.12
2+
version = 3.7.15
33
maxColumn = 120

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ import com.typesafe.tools.mima.core._
55

66
val scala2_11 = "2.11.12"
77
val scala2_12 = "2.12.18"
8-
val scala2_13 = "2.13.11"
8+
val scala2_13 = "2.13.12"
99
val scala2 = List(scala2_11, scala2_12, scala2_13)
1010
val scala2alive = List(scala2_12, scala2_13)
11-
val scala3 = List("3.3.0")
11+
val scala3 = List("3.3.1")
1212

1313
val sttpModelVersion = "1.6.0"
1414

15-
val scalaTestVersion = "3.2.16"
15+
val scalaTestVersion = "3.2.17"
1616
val zio1Version = "1.0.18"
1717
val zio2Version = "2.0.10"
1818
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.8.0"
22+
val fs2_3_version = "3.9.3"
2323
val armeriaVersion = "1.25.0"
2424

2525
excludeLintKeys in Global ++= Set(ideSkipProject)
@@ -62,7 +62,7 @@ val commonJsSettings = commonSettings ++ Seq(
6262
}
6363
},
6464
libraryDependencies ++= Seq(
65-
"org.scala-js" %%% "scalajs-dom" % "2.6.0"
65+
"org.scala-js" %%% "scalajs-dom" % "2.8.0"
6666
)
6767
)
6868

project/build.properties

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

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
2-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
3-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
2+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
3+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16")
44
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.1")
55

6-
val sbtSoftwareMillVersion = "2.0.13"
6+
val sbtSoftwareMillVersion = "2.0.18"
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)