Merge branch 'master' into update/scalacheck-1.18.1

theiterators · Sep 17, 2024 · 1cc2e17 · 1cc2e17
2 parents 0f436ba + 2c1b8a4
commit 1cc2e17
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -96,6 +96,7 @@ def paradiseFlag(scalaVersion: String): Seq[String] =
 
 val scalaTest       = Def.setting("org.scalatest" %%% "scalatest" % "3.2.19")
 val scalaCheck      = Def.setting("org.scalacheck" %%% "scalacheck" % "1.18.1")
+
 val slick           = "com.typesafe.slick"  %% "slick"           % "3.5.1"
 val optionalSlick   = optional(slick)
 val playJson        = Def.setting("org.playframework" %%% "play-json" % "3.0.4")
@@ -141,7 +142,7 @@ def akkaHttpInExamples = {
   )
 }
 
-val pekkoVersion       = "1.1.0"
+val pekkoVersion       = "1.1.1"
 val pekkoHttpVersion   = "1.0.1"
 val pekkoHttpJsonV     = "2.0.0"
 val pekkoStream        = "org.apache.pekko" %% "pekko-stream"         % pekkoVersion

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.10.1
+sbt.version = 1.10.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -7,4 +7,4 @@ addSbtPlugin("com.github.sbt"     % "sbt-ci-release" % "1.6.1")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.2")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.16.0")
-addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.5.4")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.5.5")