From 9f0bdd4a7f9d44e72d7c33f5a35123ad025d9b53 Mon Sep 17 00:00:00 2001 From: spenes Date: Wed, 16 Feb 2022 01:40:55 +0300 Subject: [PATCH] Bump lemonlabs scala-uri to 1.5.1 (close #556) --- project/BuildSettings.scala | 1 + project/Dependencies.scala | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala index 7fc62fb40..c4b73d8f5 100644 --- a/project/BuildSettings.scala +++ b/project/BuildSettings.scala @@ -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 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 47f90e1ff..d45e26084 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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"