Skip to content

Commit

Permalink
Bump lemonlabs scala-uri to 1.5.1 (close #556)
Browse files Browse the repository at this point in the history
  • Loading branch information
spenes committed Feb 16, 2022
1 parent 7b6e9a4 commit 9f0bdd4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions project/BuildSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ object BuildSettings {
case x if x.endsWith(".proto") => MergeStrategy.first
case x if x.endsWith("reflection-config.json") => MergeStrategy.first
case x if x.endsWith("config.fmpp") => MergeStrategy.first
case x if x.contains("simulacrum") => MergeStrategy.first
case x if x.endsWith("git.properties") => MergeStrategy.discard
case x =>
val oldStrategy = (assembly / assemblyMergeStrategy).value
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ object Dependencies {
val scalaForex = "1.0.0"
val scalaWeather = "1.0.0"
val gatlingJsonpath = "0.6.14"
val scalaUri = "1.4.5"
val scalaUri = "1.5.1"
val badRows = "2.1.0"
val igluClient = "1.0.2"

Expand Down

0 comments on commit 9f0bdd4

Please sign in to comment.