From 00bcad230b87502169aa7afeea3f8f0894da3c0e Mon Sep 17 00:00:00 2001 From: Jean Logeart Date: Fri, 4 Oct 2024 10:40:08 -0400 Subject: [PATCH] PAY-4070: Upgrade scala to version 2.13.15 (#584) --- build.sbt | 14 +++++++------- project/plugins.sbt | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index d98d5cd..72172e6 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "registry" -ThisBuild / scalaVersion := "2.13.14" +ThisBuild / scalaVersion := "2.13.15" ThisBuild / javacOptions ++= Seq("-source", "17", "-target", "17") // Resolve scala-xml version dependency mismatch, see https://github.com/sbt/sbt/issues/7007 @@ -30,21 +30,21 @@ lazy val api = project scalafmtOnCompile := true, routesImport += "io.flow.registry.v0.Bindables._", routesGenerator := InjectedRoutesGenerator, - javaAgents += "com.datadoghq" % "dd-java-agent" % "1.39.0", + javaAgents += "com.datadoghq" % "dd-java-agent" % "1.40.1", libraryDependencies ++= Seq( ws, "com.google.inject" % "guice" % "5.1.0", "com.google.inject.extensions" % "guice-assistedinject" % "5.1.0", "org.projectlombok" % "lombok" % "1.18.34" % "provided", jdbc, - "io.flow" %% "lib-postgresql-play-play28" % "0.5.69", - "io.flow" %% "lib-metrics-play28" % "1.0.96", + "io.flow" %% "lib-postgresql-play-play28" % "0.5.71", + "io.flow" %% "lib-metrics-play28" % "1.0.97", "com.typesafe.play" %% "play-json-joda" % "2.9.4", "org.postgresql" % "postgresql" % "42.7.4", "net.jcazevedo" %% "moultingyaml" % "0.4.2", - "io.flow" %% "lib-test-utils-play28" % "0.2.39" % Test, - "io.flow" %% "lib-usage-play28" % "0.2.56", - "io.flow" %% "lib-log" % "0.2.25", + "io.flow" %% "lib-test-utils-play28" % "0.2.40" % Test, + "io.flow" %% "lib-usage-play28" % "0.2.57", + "io.flow" %% "lib-log" % "0.2.26", ), Test / javaOptions ++= Seq( "--add-exports=java.base/sun.security.x509=ALL-UNNAMED", diff --git a/project/plugins.sbt b/project/plugins.sbt index d8787d1..c3bc595 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -23,4 +23,4 @@ ThisBuild / libraryDependencySchemes ++= Seq( ) addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1")