Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #934

Merged
merged 3 commits into from
Jun 27, 2024
Merged

Upgrade dependencies #934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07989a7
wip
mbryzek Jun 27, 2024
6915702
wip
mbryzek Jun 27, 2024
27c62b7
wip
mbryzek Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/test/lib/UtilSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ 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")))
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -152,7 +152,7 @@ lazy val app = project
"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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
Loading