Skip to content

Commit

Permalink
Add support for merging reference-overrides.conf as config
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian Bravo committed May 3, 2018
1 parent 8dee0de commit 1651997
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/scala/sbtassembly/Assembly.scala
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ object Assembly {

Using.fileOutputStream(true)(outPath) { out => IO.transfer(tmpFile, out) }
tmpFile.delete()

try {
sys.process.Process("chmod", Seq("+x", outPath.toString)).!
}
Expand Down Expand Up @@ -274,7 +274,7 @@ object Assembly {

def isConfigFile(fileName: String): Boolean =
fileName.toLowerCase match {
case "reference.conf" | "application.conf" | "rootdoc.txt" | "play.plugins" => true
case "reference.conf" | "reference-overrides.conf" | "application.conf" | "rootdoc.txt" | "play.plugins" => true
case _ => false
}

Expand Down

0 comments on commit 1651997

Please # to comment.