Merge branch 'main' into update/scala3-library-3.3.4

akka · Sep 30, 2024 · ae09cf0 · ae09cf0
2 parents 6056838 + d5059d7
commit ae09cf0
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/integration-test/dns-api-mesos/build.sbt b/integration-test/dns-api-mesos/build.sbt
@@ -4,7 +4,7 @@ resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
 name := "bootstrap-demo-dns-api"
 
-scalaVersion := "2.13.14"
+scalaVersion := "2.13.15"
 
 def akkaManagementVersion(version: String) = version.split('+')(0)
 

diff --git a/native-image-tests/build.sbt b/native-image-tests/build.sbt
@@ -2,7 +2,7 @@ name := "native-image-tests"
 
 version := "1.0"
 
-scalaVersion := "2.13.14"
+scalaVersion := "2.13.15"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 

diff --git a/native-image-tests/project/build.properties b/native-image-tests/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.2
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,7 +6,7 @@ object Dependencies {
   // sync with Java version in .github/workflows/release.yml#documentation
   lazy val JavaDocLinkVersion = 17
 
-  val Scala213 = "2.13.14"
+  val Scala213 = "2.13.15"
   val Scala3 = "3.3.4"
   val CrossScalaVersions = Seq(Scala213, Scala3)
 

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/samples/akka-sample-cluster-kubernetes-scala/build.sbt b/samples/akka-sample-cluster-kubernetes-scala/build.sbt
@@ -2,7 +2,7 @@ ThisBuild / organization := "com.lightbend"
 
 name := "akka-sample-cluster-kubernetes"
 
-scalaVersion := "2.13.14"
+scalaVersion := "2.13.15"
 lazy val akkaHttpVersion = "10.6.3"
 lazy val akkaVersion = "2.9.3"
 lazy val akkaManagementVersion = "1.5.3"