Skip to content

Commit

Permalink
revert previous suggestion
Browse files Browse the repository at this point in the history
  • Loading branch information
kory33 authored Feb 26, 2023
1 parent 3be6e51 commit 89ef535
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ assembly / assemblyExcludedJars := {

// protocol配下とルートのLICENSEが衝突してCIが落ちる
// cf. https://github.com/sbt/sbt-assembly/issues/141
assemblyMergeStrategy in ThisBuild := {
assemblyMergeStrategy in assembly := {
case PathList(ps @ _*) if ps.last endsWith "LICENSE" => MergeStrategy.rename
case otherFile =>
val oldStrategy = (assemblyMergeStrategy in ThisBuild).value
val oldStrategy = (assemblyMergeStrategy in assembly).value
oldStrategy(otherFile)
}

Expand Down

0 comments on commit 89ef535

Please sign in to comment.