Skip to content

Commit

Permalink
Upgrade libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
gheine committed Jan 5, 2024
1 parent 35dba7a commit af705b4
Show file tree
Hide file tree
Showing 19 changed files with 65 additions and 61 deletions.
5 changes: 3 additions & 2 deletions api/app/generated/FlowCommonV0Conversions.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/app/generated/FlowCommonV0Parsers.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/app/generated/FlowDependencyV0Conversions.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/app/generated/FlowDependencyV0Parsers.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions api/app/generated/FlowErrorV0Conversions.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/app/generated/FlowErrorV0Parsers.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions api/app/generated/FlowGithubV0Conversions.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/app/generated/FlowGithubV0Parsers.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/conf/dependency.routes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by API Builder - https://www.apibuilder.io
# Service version: 0.8.18
# apibuilder 0.15.33 app.apibuilder.io/flow/dependency/latest/play_2_x_routes
# apibuilder app.apibuilder.io/flow/dependency/latest/play_2_x_routes

GET /binaries controllers.Binaries.get(id: _root_.scala.Option[String], ids: _root_.scala.Option[List[String]], project_id: _root_.scala.Option[String], name: _root_.scala.Option[String], limit: Long ?= 25L, offset: Long ?= 0L)
GET /binaries/:id controllers.Binaries.getById(id: String)
Expand Down
30 changes: 15 additions & 15 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ lazy val api = project
.enablePlugins(JavaAppPackaging, JavaAgent)
.settings(commonSettings: _*)
.settings(
javaAgents += "com.datadoghq" % "dd-java-agent" % "1.20.1",
javaAgents += "com.datadoghq" % "dd-java-agent" % "1.27.0",
routesImport += "io.flow.dependency.v0.Bindables.Core._",
routesImport += "io.flow.dependency.v0.Bindables.Models._",
routesGenerator := InjectedRoutesGenerator,
Expand All @@ -56,16 +56,16 @@ 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.30" % "provided",
"com.sendgrid" % "sendgrid-java" % "4.7.1",
"io.flow" %% "lib-event-sync-play28" % "0.6.28",
"io.flow" %% "lib-metrics-play28" % "1.0.67",
"io.flow" %% "lib-log" % "0.2.4",
"io.flow" %% "lib-usage-play28" % "0.2.30",
"io.flow" %% "lib-test-utils-play28" % "0.2.12" % Test,
"io.flow" %% "lib-event-sync-play28" % "0.6.35",
"io.flow" %% "lib-metrics-play28" % "1.0.76",
"io.flow" %% "lib-log" % "0.2.12",
"io.flow" %% "lib-usage-play28" % "0.2.36",
"io.flow" %% "lib-test-utils-play28" % "0.2.22" % Test,
"net.sourceforge.htmlcleaner" % "htmlcleaner" % "2.29",
"org.postgresql" % "postgresql" % "42.6.0",
"org.apache.commons" % "commons-text" % "1.10.0",
"org.postgresql" % "postgresql" % "42.7.1",
"org.apache.commons" % "commons-text" % "1.11.0",
),
scalacOptions ++= allScalacOptions,
)
Expand All @@ -80,7 +80,7 @@ lazy val www = project
.enablePlugins(SbtWeb)
.settings(commonSettings: _*)
.settings(
javaAgents += "com.datadoghq" % "dd-java-agent" % "1.20.1",
javaAgents += "com.datadoghq" % "dd-java-agent" % "1.27.0",
routesImport += "io.flow.dependency.v0.Bindables.Core._",
routesImport += "io.flow.dependency.v0.Bindables.Models._",
routesGenerator := InjectedRoutesGenerator,
Expand All @@ -89,13 +89,13 @@ lazy val www = 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.webjars" %% "webjars-play" % "2.8.18",
"org.projectlombok" % "lombok" % "1.18.30" % "provided",
"org.webjars" %% "webjars-play" % "3.0.1",
"org.webjars" % "bootstrap" % "3.4.1",
"org.webjars" % "font-awesome" % "6.4.2",
"org.webjars" % "font-awesome" % "6.5.1",
"org.webjars" % "jquery" % "3.7.1",
"org.webjars.bower" % "bootstrap-social" % "5.1.1",
"io.flow" %% "lib-test-utils-play28" % "0.2.12" % Test,
"io.flow" %% "lib-test-utils-play28" % "0.2.22" % 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.78",
"io.flow" %% "lib-play-play28" % "0.7.87",
"com.typesafe.play" %% "play-json-joda" % "2.9.4",
),
Test / javaOptions ++= Seq(
Expand Down
8 changes: 4 additions & 4 deletions generated/app/FlowCommonV0Client.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions generated/app/FlowDependencyV0Client.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions generated/app/FlowDockerHubV0Client.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions generated/app/FlowDockerRegistryV0Client.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions generated/app/FlowErrorV0Client.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions generated/app/FlowGithubOauthV0Client.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions generated/app/FlowGithubV0Client.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions generated/app/FlowHealthcheckV0Client.scala

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1")

resolvers += "Flow Plugins" at "https://flow.jfrog.io/flow/plugins-release/"

addSbtPlugin("io.flow" % "sbt-flow-linter" % "0.0.41")
addSbtPlugin("io.flow" % "sbt-flow-linter" % "0.0.54")

// Resolve scala-xml version dependency mismatch, see https://github.com/sbt/sbt/issues/7007
ThisBuild / libraryDependencySchemes ++= Seq(
Expand Down

0 comments on commit af705b4

Please sign in to comment.