From a63aabf02705f15653f1e03a631479215cf0e0f9 Mon Sep 17 00:00:00 2001 From: Lucas Burson Date: Sun, 19 May 2024 15:10:51 -0500 Subject: [PATCH] Update to Playframework 2.9 --- build.sbt | 10 +++++----- project/build.properties | 2 +- project/plugins.sbt | 7 ++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 179badf1..194b96c8 100644 --- a/build.sbt +++ b/build.sbt @@ -82,10 +82,10 @@ libraryDependencies ++= Seq( guice, // NOTE: Be careful upgrading sangria and play-json as binary incompatibilities can break graphql and the entire UI. // See the compatibility matrix here https://github.com/sangria-graphql/sangria-play-json - "org.sangria-graphql" %% "sangria-play-json" % "2.0.1", - "org.sangria-graphql" %% "sangria" % "2.0.1", - "com.typesafe.play" %% "play-json-joda" % "2.8.2", - "com.typesafe.play" %% "play-json" % "2.8.2", + "org.sangria-graphql" %% "sangria-play-json" % "2.0.2", + "org.sangria-graphql" %% "sangria" % "4.0.2", + "com.typesafe.play" %% "play-json-joda" % "2.10.5", + "com.typesafe.play" %% "play-json" % "2.10.5", "org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test, "org.scalatestplus" %% "mockito-4-5" % "3.2.12.0" % Test, // NOTE: The swagger-ui package is used to obtain the static distribution of swagger-ui, the files included at runtime @@ -99,7 +99,7 @@ libraryDependencies ++= Seq( // At some point other libraries will need to be updated to use the ServiceLoader mechanism and we can remove this. // See https://www.slf4j.org/codes.html#ignoredBindings "net.postgis" % "postgis-jdbc" % "2023.1.0" exclude ("org.slf4j", "slf4j-api"), // https://github.com/postgis/postgis-java/releases - "joda-time" % "joda-time" % "2.12.0", + "joda-time" % "joda-time" % "2.12.7", // https://github.com/locationtech/jts/releases "org.locationtech.jts" % "jts-core" % "1.19.0", "org.wololo" % "jts2geojson" % "0.18.1", // https://github.com/bjornharrtell/jts2geojson/releases diff --git a/project/build.properties b/project/build.properties index d50194b2..569ab8f7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ # https://github.com/sbt/sbt/releases -sbt.version=1.7.2 +sbt.version=1.9.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index ded621e5..6dc6c59d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ logLevel := Level.Warn addDependencyTreePlugin // https://github.com/playframework/playframework/releases -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.21") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.3") addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2") @@ -20,3 +20,8 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.3") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1") + +// https://github.com/sbt/sbt/issues/6997 +ThisBuild / libraryDependencySchemes ++= Seq( + "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always +)