From 07989a73cb5c29c205274a9d4412aca89e2d15b5 Mon Sep 17 00:00:00 2001 From: Michael Bryzek Date: Thu, 27 Jun 2024 10:25:56 -0400 Subject: [PATCH 1/3] wip --- build.sbt | 14 +++++++------- project/plugins.sbt | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 4acda1f49..37a670f62 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ lazy val lib = project val avroVersion = "1.11.1" -val playJsonVersion = "2.10.5" +val playJsonVersion = "2.10.6" lazy val avro = project .in(file("avro")) @@ -63,7 +63,7 @@ lazy val swagger = project ) ) -val circeVersion = "0.14.7" +val circeVersion = "0.14.8" lazy val core = project .in(file("core")) .dependsOn(generated, lib, avro, swagger) @@ -112,7 +112,7 @@ lazy val api = project ws, "com.google.inject" % "guice" % "5.1.0", "com.google.inject.extensions" % "guice-assistedinject" % "5.1.0", - "org.projectlombok" % "lombok" % "1.18.28" % "provided", + "org.projectlombok" % "lombok" % "1.18.32" % "provided", "com.typesafe.play" %% "play-json-joda" % playJsonVersion, "com.typesafe.play" %% "play-json" % playJsonVersion, "org.postgresql" % "postgresql" % "42.7.3", @@ -146,13 +146,13 @@ lazy val app = project routesGenerator := InjectedRoutesGenerator, libraryDependencies ++= Seq( guice, - "com.google.inject" % "guice" % "5.1.0", - "com.google.inject.extensions" % "guice-assistedinject" % "5.1.0", + "com.google.inject" % "guice" % "7.0.0", + "com.google.inject.extensions" % "guice-assistedinject" % "7.0.0", "org.projectlombok" % "lombok" % "1.18.28" % "provided", "com.typesafe.play" %% "play-json-joda" % playJsonVersion, "com.typesafe.play" %% "play-json" % playJsonVersion, "org.apache.commons" % "commons-compress" % "1.26.2", - "com.github.tototoshi" %% "scala-csv" % "1.3.10", + "com.github.tototoshi" %% "scala-csv" % "1.4.0", "com.vladsch.flexmark" % "flexmark-all" % "0.64.8", "org.webjars" %% "webjars-play" % "2.8.18", "org.webjars" % "bootstrap" % "3.3.7", @@ -182,7 +182,7 @@ lazy val commonSettings: Seq[Setting[_]] = Seq( name ~= ("apibuilder-" + _), organization := "io.apibuilder", libraryDependencies ++= Seq( - "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.13.4", + "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.17.1", "com.typesafe.play" %% "play-json-joda" % playJsonVersion, "org.atteo" % "evo-inflector" % "1.3", "org.typelevel" %% "cats-core" % "2.12.0", diff --git a/project/plugins.sbt b/project/plugins.sbt index baa521694..d09611587 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,9 +5,9 @@ logLevel := Level.Warn resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/" // Use the Play sbt plugin for Play projects -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.4") -addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.6") +addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.7") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1") From 691570228af4b00dfd755eb27e7e71d9aba3fb37 Mon Sep 17 00:00:00 2001 From: Michael Bryzek Date: Thu, 27 Jun 2024 10:33:51 -0400 Subject: [PATCH 2/3] wip --- app/test/lib/UtilSpec.scala | 5 +++-- build.sbt | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/test/lib/UtilSpec.scala b/app/test/lib/UtilSpec.scala index bf3ff8e76..aab0a3e72 100644 --- a/app/test/lib/UtilSpec.scala +++ b/app/test/lib/UtilSpec.scala @@ -5,8 +5,9 @@ import org.scalatestplus.play.guice.GuiceOneAppPerSuite class UtilSpec extends PlaySpec with GuiceOneAppPerSuite { - private[this] lazy val util = app.injector.instanceOf[Util] - + private[this] val util = app.injector.instanceOf[Util] +} + "validateReturnUrl for invalid domains" in { util.validateReturnUrl("") must be(Left(Seq("Redirect URL[] must start with / or a known domain"))) util.validateReturnUrl("https://google.com/foo") must be(Left(Seq("Redirect URL[https://google.com/foo] must start with / or a known domain"))) diff --git a/build.sbt b/build.sbt index 37a670f62..1cb0deebc 100644 --- a/build.sbt +++ b/build.sbt @@ -146,8 +146,8 @@ lazy val app = project routesGenerator := InjectedRoutesGenerator, libraryDependencies ++= Seq( guice, - "com.google.inject" % "guice" % "7.0.0", - "com.google.inject.extensions" % "guice-assistedinject" % "7.0.0", + "com.google.inject" % "guice" % "5.1.0", + "com.google.inject.extensions" % "guice-assistedinject" % "5.1.0", "org.projectlombok" % "lombok" % "1.18.28" % "provided", "com.typesafe.play" %% "play-json-joda" % playJsonVersion, "com.typesafe.play" %% "play-json" % playJsonVersion, From 27c62b7dfe4b6cf976cb0cb4ca8eceab15e5cc82 Mon Sep 17 00:00:00 2001 From: Michael Bryzek Date: Thu, 27 Jun 2024 10:34:03 -0400 Subject: [PATCH 3/3] wip --- app/test/lib/UtilSpec.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/app/test/lib/UtilSpec.scala b/app/test/lib/UtilSpec.scala index aab0a3e72..2b1b9b171 100644 --- a/app/test/lib/UtilSpec.scala +++ b/app/test/lib/UtilSpec.scala @@ -6,7 +6,6 @@ import org.scalatestplus.play.guice.GuiceOneAppPerSuite class UtilSpec extends PlaySpec with GuiceOneAppPerSuite { private[this] val util = app.injector.instanceOf[Util] -} "validateReturnUrl for invalid domains" in { util.validateReturnUrl("") must be(Left(Seq("Redirect URL[] must start with / or a known domain")))