diff --git a/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala b/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala deleted file mode 100644 index 1c3a6530b..000000000 --- a/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala +++ /dev/null @@ -1,25 +0,0 @@ -import sbt._ -import Keys._ -import Import._ - -object P extends Build -{ - override def settings = super.settings ++ Seq( - scalaBinaryVersion in update := "2.9.0" - ) - - def configIvyScala = - ivyScala ~= { _.map(_.copy(checkExplicit = false)) } - - val declared = SettingKey[Boolean]("declared") - lazy val a = Project("A", file("a")) settings( - libraryDependencies += "org.scala-tools.sbinary" %% "sbinary" % "0.4.0" % "provided", - configIvyScala - ) - - lazy val b = Project("B", file("b")) dependsOn(a) settings( - libraryDependencies <<= declared(d => if(d) Seq("org.scala-tools.sbinary" %% "sbinary" % "0.4.0" % "provided") else Nil), - declared <<= baseDirectory(_ / "declare.lib" exists), - configIvyScala - ) -} \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/provided-multi/changes/p.sbt b/sbt/src/sbt-test/dependency-management/provided-multi/changes/p.sbt new file mode 100644 index 000000000..3dc6dc210 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/provided-multi/changes/p.sbt @@ -0,0 +1,19 @@ +def configIvyScala = + ivyScala ~= { _.map(_.copy(checkExplicit = false)) } + +val declared = SettingKey[Boolean]("declared") +lazy val a = project. + settings( + libraryDependencies += "org.scala-tools.sbinary" %% "sbinary" % "0.4.0" % "provided", + configIvyScala, + scalaBinaryVersion in update := "2.9.0" + ) + +lazy val b = project. + dependsOn(a). + settings( + libraryDependencies <<= declared(d => if(d) Seq("org.scala-tools.sbinary" %% "sbinary" % "0.4.0" % "provided") else Nil), + declared <<= baseDirectory(_ / "declare.lib" exists), + configIvyScala, + scalaBinaryVersion in update := "2.9.0" + ) diff --git a/sbt/src/sbt-test/dependency-management/provided-multi/test b/sbt/src/sbt-test/dependency-management/provided-multi/test index 17c17ebd2..211dd1327 100644 --- a/sbt/src/sbt-test/dependency-management/provided-multi/test +++ b/sbt/src/sbt-test/dependency-management/provided-multi/test @@ -1,11 +1,11 @@ -$ copy-file changes/P.scala project/P.scala +$ copy-file changes/p.sbt p.sbt $ copy-file changes/A.scala a/src/main/scala/A.scala $ copy-file changes/B.scala b/src/main/scala/B.scala > reload -> A/compile --> B/compile +> a/compile +-> b/compile $ touch b/declare.lib > reload -> compile \ No newline at end of file +> compile