luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

source compatibility of ClasspathUtilities.isArchive for sbt-assembly 

default parameters and eta-expansion don't interact well
This commit is contained in:
Mark Harrah 2013-06-20 16:37:11 -04:00
parent a3defe2556
commit 39f6456a81
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/classpath/src/main/scala/sbt/classpath/ClasspathUtilities.scala
View File

@ -74,7 +74,9 @@ object ClasspathUtilities
private[sbt] def printSource(c: Class[_]) =
println(c.getName + " loader=" +c.getClassLoader + " location=" + IO.classLocationFile(c))
def isArchive(file: File, contentFallback: Boolean = false): Boolean =
def isArchive(file: File): Boolean = isArchive(file, contentFallback = false)
def isArchive(file: File, contentFallback: Boolean): Boolean =
file.isFile && (isArchiveName(file.getName) || (contentFallback && hasZipContent(file)))
def isArchiveName(fileName: String) = fileName.endsWith(".jar") || fileName.endsWith(".zip")