From b3cbdf2bf24ea0ab569e7608b04bdb1a8ee95c9d Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 5 Mar 2013 17:21:53 -0500 Subject: [PATCH] fix project/flatten scripted test --- sbt/src/sbt-test/project/flatten/project/Flat.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbt/src/sbt-test/project/flatten/project/Flat.scala b/sbt/src/sbt-test/project/flatten/project/Flat.scala index 032624155..1613ac0ef 100644 --- a/sbt/src/sbt-test/project/flatten/project/Flat.scala +++ b/sbt/src/sbt-test/project/flatten/project/Flat.scala @@ -11,14 +11,14 @@ object Flat extends Build def baseSettings = Seq( scalaVersion := "2.8.1", libraryDependencies += "org.scala-tools.testing" %% "scalacheck" % "1.8" % "test", - sourceFilter := "*.java" | "*.scala" + includeFilter in unmanagedSources := "*.java" | "*.scala" ) def forConfig(conf: Configuration, name: String) = Project.inConfig(conf)( unpackageSettings(name) ) def unpackageSettings(name: String) = Seq( unmanagedSourceDirectories := (baseDirectory.value / name) :: Nil, - defaultExcludes in unmanagedResources := sourceFilter.value, + excludeFilter in unmanagedResources := (includeFilter in unmanagedSources).value, unmanagedResourceDirectories := unmanagedSourceDirectories.value, unpackage := IO.unzip(artifactPath in packageSrc value, baseDirectory.value / name) )