From 39f6456a81536bdbaf7e06bdf897741fa5ef8d8c Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Thu, 20 Jun 2013 16:37:11 -0400 Subject: [PATCH] source compatibility of ClasspathUtilities.isArchive for sbt-assembly default parameters and eta-expansion don't interact well --- .../src/main/scala/sbt/classpath/ClasspathUtilities.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/classpath/src/main/scala/sbt/classpath/ClasspathUtilities.scala b/util/classpath/src/main/scala/sbt/classpath/ClasspathUtilities.scala index ff987f113..e54ffe5b4 100644 --- a/util/classpath/src/main/scala/sbt/classpath/ClasspathUtilities.scala +++ b/util/classpath/src/main/scala/sbt/classpath/ClasspathUtilities.scala @@ -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")