Merge pull request #176 from 100km/update-external

samueltardieu · web-flow · commit c7f88b202849 · 2023-09-18T18:52:40.000+02:00
Update external dependencies
diff --git a/build.sbt b/build.sbt
@@ -24,6 +24,7 @@ lazy val assemble =
     assembly / assemblyPrependShellScript := Some(defaultShellScript :+ ""),
     assembly / assemblyMergeStrategy := {
       case "module-info.class" => MergeStrategy.discard
+      case PathList("META-INF", _*) => MergeStrategy.discard
       case PathList(ps @ _*) if ps.last.endsWith(".proto") => MergeStrategy.first
       case x =>
         val oldStrategy = (assembly / assemblyMergeStrategy).value
diff --git a/external/canape b/external/canape
@@ -1 +1 @@
-Subproject commit f25102769c4662e236115ceecc9c81ea510c3ce3
+Subproject commit 5c4dce2420442f0f8bc025032b4e26cb3851669d
diff --git a/external/octopush-akka b/external/octopush-akka
@@ -1 +1 @@
-Subproject commit f1019e0cba3d45b88647576cda959c3d6ec1faee
+Subproject commit 52a5709b88103ea1419750f30f631ee65b1948fb
diff --git a/external/rxtelegram b/external/rxtelegram
@@ -1 +1 @@
-Subproject commit 24e60e2745edf5c24f36e33afd75cc80b1c149d5
+Subproject commit af317d0681537a11a235da64bfa639227417d9af
