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

fix includeFilter in unmanagedJars reference

This commit is contained in:
Mark Harrah 2011-09-03 17:30:37 -04:00
parent 228b245d2d
commit 8938fc564e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/Defaults.scala
View File

@ -593,7 +593,7 @@ object Classpaths
managedClasspath <<= (classpathConfiguration, classpathTypes, update) map managedJars, managedClasspath <<= (classpathConfiguration, classpathTypes, update) map managedJars,
// remove when defaultExcludes and classpathFilter are removed // remove when defaultExcludes and classpathFilter are removed
excludeFilter in unmanagedJars <<= (defaultExcludes in unmanagedJars) or (excludeFilter in unmanagedJars), excludeFilter in unmanagedJars <<= (defaultExcludes in unmanagedJars) or (excludeFilter in unmanagedJars),
includeFilter in unmanagedJars <<= classpathFilter or (defaultExcludes in unmanagedJars), includeFilter in unmanagedJars <<= classpathFilter or (includeFilter in unmanagedJars),
unmanagedJars <<= (configuration, unmanagedBase, includeFilter in unmanagedJars, excludeFilter in unmanagedJars) map { (config, base, filter, excl) => unmanagedJars <<= (configuration, unmanagedBase, includeFilter in unmanagedJars, excludeFilter in unmanagedJars) map { (config, base, filter, excl) =>
(base * (filter -- excl) +++ (base / config.name).descendentsExcept(filter, excl)).classpath (base * (filter -- excl) +++ (base / config.name).descendentsExcept(filter, excl)).classpath
} }