Merge pull request #4447 from eatkins/managed-source-fix

Fix '~' for dependent projects with a broken parent (1.2.x)

.travis.yml

@@ -41,7 +41,7 @@ env:
     - SBT_CMD="scripted source-dependencies/*1of3"
     - SBT_CMD="scripted source-dependencies/*2of3"
     - SBT_CMD="scripted source-dependencies/*3of3"
-    - SBT_CMD="scripted tests/*"
+    - SBT_CMD="scripted tests/* watch/*"
     - SBT_CMD="repoOverrideTest:scripted dependency-management/*"
 
 notifications:

main/src/main/scala/sbt/Defaults.scala

@@ -361,14 +361,19 @@ object Defaults extends BuildCommon {
       val include = (includeFilter in unmanagedSources).value
       val exclude = (excludeFilter in unmanagedSources).value match {
         case e =>
-          (managedSources in ThisScope).value match {
-            case l if l.nonEmpty =>
-              e || new FileFilter {
-                private val files = l.toSet
-                override def accept(pathname: File): Boolean = files.contains(pathname)
-                override def toString = s"ManagedSourcesFilter($files)"
-              }
-            case _ => e
+          val s = state.value
+          try {
+            Project.extract(s).runTask(managedSources in Compile in ThisScope, s) match {
+              case (_, l) if l.nonEmpty =>
+                e || new FileFilter {
+                  private val files = l.toSet
+                  override def accept(pathname: File): Boolean = files.contains(pathname)
+                  override def toString = s"ManagedSourcesFilter($files)"
+                }
+              case _ => e
+            }
+          } catch {
+            case NonFatal(_) => e
           }
       }
       val baseSources =

sbt/src/sbt-test/watch/watch-sources/build.sbt

@@ -0,0 +1,3 @@
+lazy val root = (project in file(".")).aggregate(parent, child)
+lazy val parent = project
+lazy val child = project.enablePlugins(JmhPlugin).dependsOn(parent)

sbt/src/sbt-test/watch/watch-sources/changes/Foo.scala

@@ -0,0 +1 @@
+class Foo

sbt/src/sbt-test/watch/watch-sources/child/src/main/scala/Bar.scala

@@ -0,0 +1 @@
+class Bar

sbt/src/sbt-test/watch/watch-sources/parent/src/main/scala/Foo.scala

@@ -0,0 +1 @@
+class Foo {

sbt/src/sbt-test/watch/watch-sources/project/plugin.sbt

@@ -0,0 +1 @@
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.4")

sbt/src/sbt-test/watch/watch-sources/test

@@ -0,0 +1,9 @@
+> watchTransitiveSources
+
+-> compile
+
+$ copy-file changes/Foo.scala parent/src/main/scala/Foo.scala
+
+> watchTransitiveSources
+
+> compile