Skip to content

Commit

Permalink
Merge branch 'main' into pg15
Browse files Browse the repository at this point in the history
  • Loading branch information
gheine authored Mar 1, 2024
2 parents 1b9872f + b0bdd3d commit 102e6f0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-validator.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "PR Title and Description Check"
on:
pull_request:
types: [opened, edited, synchronize]
types: [opened, edited]

jobs:
check-title-and-description:
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ lazy val api = project
"com.google.inject.extensions" % "guice-assistedinject" % "5.1.0",
"org.projectlombok" % "lombok" % "1.18.30" % "provided",
"com.sendgrid" % "sendgrid-java" % "4.7.1",
"io.flow" %% "lib-event-sync-play28" % "0.6.37",
"io.flow" %% "lib-metrics-play28" % "1.0.77",
"io.flow" %% "lib-event-sync-play28" % "0.6.38",
"io.flow" %% "lib-metrics-play28" % "1.0.79",
"io.flow" %% "lib-log" % "0.2.14",
"io.flow" %% "lib-usage-play28" % "0.2.37",
"io.flow" %% "lib-test-utils-play28" % "0.2.23" % Test,
"io.flow" %% "lib-usage-play28" % "0.2.38",
"io.flow" %% "lib-test-utils-play28" % "0.2.24" % Test,
"net.sourceforge.htmlcleaner" % "htmlcleaner" % "2.29",
"org.postgresql" % "postgresql" % "42.7.1",
"org.apache.commons" % "commons-text" % "1.11.0",
Expand Down Expand Up @@ -95,7 +95,7 @@ lazy val www = project
"org.webjars" % "font-awesome" % "6.4.2",
"org.webjars" % "jquery" % "3.7.1",
"org.webjars.bower" % "bootstrap-social" % "5.1.1",
"io.flow" %% "lib-test-utils-play28" % "0.2.23" % Test,
"io.flow" %% "lib-test-utils-play28" % "0.2.24" % Test,
),
scalacOptions ++= allScalacOptions,
)
Expand All @@ -115,7 +115,7 @@ lazy val commonSettings: Seq[Setting[_]] = Seq(
scalafmtOnCompile := true,
name ~= ("dependency-" + _),
libraryDependencies ++= Seq(
"io.flow" %% "lib-play-play28" % "0.7.89",
"io.flow" %% "lib-play-play28" % "0.7.90",
"com.typesafe.play" %% "play-json-joda" % "2.9.4",
),
Test / javaOptions ++= Seq(
Expand Down

0 comments on commit 102e6f0

Please sign in to comment.