aboutsummaryrefslogtreecommitdiffstats
path: root/scalding
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@archive.org>2018-05-23 12:30:46 -0700
committerBryan Newbold <bnewbold@archive.org>2018-05-24 00:02:36 -0700
commit74a3a8ea05824e7bc300f6889957b7903a78dee5 (patch)
tree35f653e7de8f69ee1cd960919c49c5298383b973 /scalding
parent4ba428db30593b67283dd90b92141f99840dc78e (diff)
downloadsandcrawler-74a3a8ea05824e7bc300f6889957b7903a78dee5.tar.gz
sandcrawler-74a3a8ea05824e7bc300f6889957b7903a78dee5.zip
assemblyMergeStrategy deprecation warning
Diffstat (limited to 'scalding')
-rw-r--r--scalding/build.sbt4
1 files changed, 2 insertions, 2 deletions
diff --git a/scalding/build.sbt b/scalding/build.sbt
index aae8506..073315f 100644
--- a/scalding/build.sbt
+++ b/scalding/build.sbt
@@ -31,7 +31,7 @@ lazy val root = (project in file(".")).
// cargo-culted from twitter/scalding's build.sbt
// hint via https://stackoverflow.com/questions/23280494/sbt-assembly-error-deduplicate-different-file-contents-found-in-the-following#23280952
- mergeStrategy in assembly := {
+ assemblyMergeStrategy in assembly := {
case s if s.endsWith(".class") => MergeStrategy.last
case s if s.endsWith("project.clj") => MergeStrategy.concat
case s if s.endsWith(".html") => MergeStrategy.last
@@ -44,6 +44,6 @@ lazy val root = (project in file(".")).
case s if s.endsWith("libjansi.so") => MergeStrategy.rename
case s if s.endsWith("properties") => MergeStrategy.filterDistinctLines
case s if s.endsWith("xml") => MergeStrategy.last
- case x => (mergeStrategy in assembly).value(x)
+ case x => (assemblyMergeStrategy in assembly).value(x)
},
)