Skip to content

Commit

Permalink
Fix war MANIFEST.MF handling on Windows.
Browse files Browse the repository at this point in the history
Conflicts:

	project-code/plugin/src/main/scala/Play2WarCommands.scala
  • Loading branch information
kustra authored and dlecan committed Jan 30, 2014
1 parent 23aab4b commit c45ce1a
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import sbt._

trait Play2WarCommands extends play.PlayCommands with play.PlayReloader with play.PlayPositionMapper {

val manifestRegex = """(?i).*META-INF/MANIFEST.MF"""
val manifestRegex = """(?i).*META-INF[/\\]MANIFEST.MF"""

def getFiles(root: File, skipHidden: Boolean = false): Stream[File] =
if (!root.exists || (skipHidden && root.isHidden) ||
Expand Down

0 comments on commit c45ce1a

Please sign in to comment.