diff --git a/.scalafmt.conf b/.scalafmt.conf index 0716901e..b46de1aa 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.9.8 +version = 3.9.10 runner.dialect = Scala213Source3 project.layout = StandardConvention diff --git a/build.sbt b/build.sbt index eb304e63..0650e405 100644 --- a/build.sbt +++ b/build.sbt @@ -22,7 +22,7 @@ val specs2Test = Seq( ).map("org.specs2" %% _ % "4.10.6" % Test cross (CrossVersion.for3Use2_13)) .map(_.exclude("org.scala-lang.modules", "*")) -lazy val acolyte = "org.eu.acolyte" %% "jdbc-scala" % "1.2.9" % Test +lazy val acolyte = "org.eu.acolyte" %% "jdbc-scala" % "1.2.10" % Test // Licensing import sbtheader.HeaderPlugin.autoImport.HeaderPattern.commentBetween @@ -233,7 +233,7 @@ lazy val `anorm-core` = project } Seq( - "joda-time" % "joda-time" % "2.14.0", + "joda-time" % "joda-time" % "2.14.1", "org.joda" % "joda-convert" % "3.0.1", "org.scala-lang.modules" %% "scala-parser-combinators" % parserCombinatorsVer.value, "org.scala-lang.modules" %% "scala-xml" % xmlVer % Test, @@ -334,7 +334,7 @@ lazy val `anorm-akka` = (project in file("akka")) ) .dependsOn(`anorm-core`) -lazy val pekkoVer = Def.setting[String]("1.1.4") +lazy val pekkoVer = Def.setting[String]("1.1.5") lazy val pekkoEnabled = Def.setting[Boolean] { val v = scalaBinaryVersion.value @@ -406,7 +406,7 @@ lazy val `anorm-pekko` = (project in file("pekko")) // --- -lazy val pgVer = sys.env.get("POSTGRES_VERSION").getOrElse("42.7.7") +lazy val pgVer = sys.env.get("POSTGRES_VERSION").getOrElse("42.7.10") lazy val `anorm-postgres` = (project in file("postgres")) .settings( @@ -445,7 +445,7 @@ lazy val `anorm-enumeratum` = (project in file("enumeratum")) if (scalaBinaryVersion.value != "3") { Seq( "org.scala-lang.modules" %% "scala-xml" % xmlVer % Test, - "com.beachape" %% "enumeratum" % "1.7.2", + "com.beachape" %% "enumeratum" % "1.7.6", acolyte ) ++ specs2Test } else { diff --git a/project/Common.scala b/project/Common.scala index bfedefe4..6af6ef65 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -17,7 +17,7 @@ object Common extends AutoPlugin { override def projectSettings = Seq( organization := "org.playframework.anorm", - scalaVersion := "2.12.20", + scalaVersion := "2.12.21", crossScalaVersions := Seq(scalaVersion.value, "2.13.18", "3.3.7"), Compile / unmanagedSourceDirectories ++= { val sv = scalaVersion.value diff --git a/project/build.properties b/project/build.properties index bda57bb3..1b2258c3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,3 +1,3 @@ # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. -sbt.version=1.12.4 +sbt.version=1.12.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index 9ba6910e..367e9468 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -14,7 +14,7 @@ addSbtPlugin("cchantep" % "sbt-scaladoc-compiler" % "0.2") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.6") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")