Merge branch 'main' into update/scala-library-2.13.13

akka · Mar 21, 2024 · 23a05ff · 23a05ff
2 parents 6584934 + ca95382
commit 23a05ff
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/core/src/main/scala/akka/persistence/r2dbc/internal/sqlserver/SqlServerDurableStateDao.scala b/core/src/main/scala/akka/persistence/r2dbc/internal/sqlserver/SqlServerDurableStateDao.scala
@@ -30,7 +30,7 @@ import akka.persistence.r2dbc.internal.Sql
  */
 @InternalApi
 private[r2dbc] object SqlServerDurableStateDao {
-  private def log: Logger = LoggerFactory.getLogger(classOf[SqlServerDurableStateDao])
+  private val log: Logger = LoggerFactory.getLogger(classOf[SqlServerDurableStateDao])
 }
 
 /**

diff --git a/core/src/main/scala/akka/persistence/r2dbc/internal/sqlserver/SqlServerJournalDao.scala b/core/src/main/scala/akka/persistence/r2dbc/internal/sqlserver/SqlServerJournalDao.scala
@@ -21,7 +21,7 @@ import akka.persistence.r2dbc.internal.postgres.PostgresJournalDao
  */
 @InternalApi
 private[r2dbc] object SqlServerJournalDao {
-  private def log: Logger = LoggerFactory.getLogger(classOf[SqlServerJournalDao])
+  private val log: Logger = LoggerFactory.getLogger(classOf[SqlServerJournalDao])
   val TRUE = "1"
 }
 

diff --git a/core/src/main/scala/akka/persistence/r2dbc/internal/sqlserver/SqlServerQueryDao.scala b/core/src/main/scala/akka/persistence/r2dbc/internal/sqlserver/SqlServerQueryDao.scala
@@ -27,7 +27,7 @@ import akka.persistence.r2dbc.internal.postgres.PostgresQueryDao
  */
 @InternalApi
 private[r2dbc] object SqlServerQueryDao {
-  private def log: Logger = LoggerFactory.getLogger(classOf[SqlServerQueryDao])
+  private val log: Logger = LoggerFactory.getLogger(classOf[SqlServerQueryDao])
 
 }
 

diff --git a/core/src/main/scala/akka/persistence/r2dbc/internal/sqlserver/SqlServerSnapshotDao.scala b/core/src/main/scala/akka/persistence/r2dbc/internal/sqlserver/SqlServerSnapshotDao.scala
@@ -30,7 +30,7 @@ import akka.persistence.r2dbc.internal.postgres.PostgresSnapshotDao
  */
 @InternalApi
 private[r2dbc] object SqlServerSnapshotDao {
-  private def log: Logger = LoggerFactory.getLogger(classOf[SqlServerSnapshotDao])
+  private val log: Logger = LoggerFactory.getLogger(classOf[SqlServerSnapshotDao])
 }
 
 /**

diff --git a/native-image-tests/project/build.properties b/native-image-tests/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.8
+sbt.version=1.9.9
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,7 +6,7 @@ import sbt._
 
 object Dependencies {
   val Scala213 = "2.13.13"
-  val Scala3 = "3.3.1"
+  val Scala3 = "3.3.3"
   val Scala2Versions = Seq(Scala213)
   val ScalaVersions = Dependencies.Scala2Versions :+ Dependencies.Scala3
   val AkkaVersion = System.getProperty("override.akka.version", "2.9.2")

diff --git a/project/build.properties b/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=1.9.8
+sbt.version=1.9.9