diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-c/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-c/build.sbt new file mode 100644 index 000000000..074279b36 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/ivy-settings-c/build.sbt @@ -0,0 +1,32 @@ +lazy val commonSettings = Seq( + autoScalaLibrary := false, + ivyScala := None, + unmanagedJars in Compile <++= scalaInstance map (_.allJars.toSeq), + publishArtifact in packageSrc := false, + publishArtifact in packageDoc := false, + publishMavenStyle := false +) + +lazy val dep = project. + settings( + commonSettings, + organization := "org.example", + version := "1.0", + publishTo <<= baseDirectory in ThisBuild apply { base => + Some(Resolver.file("file", base / "repo")(Resolver.ivyStylePatterns)) + } + ) + +lazy val use = project. + settings( + commonSettings, + libraryDependencies += "org.example" %% "dep" % "1.0", + externalIvySettings(), + publishTo <<= baseDirectory { base => + Some(Resolver.file("file", base / "repo")(Resolver.ivyStylePatterns)) + }, + TaskKey[Unit]("check") <<= baseDirectory map {base => + val inCache = ( (base / "target" / "use-cache") ** "*.jar").get + assert(inCache.isEmpty, "Cache contained jars: " + inCache) + } + ) diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala b/sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala deleted file mode 100644 index 9f2ba487b..000000000 --- a/sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala +++ /dev/null @@ -1,33 +0,0 @@ -import sbt._ -import Import._ -import Keys._ - -object B extends Build -{ - lazy val dep = Project("dep", file("dep")) settings( baseSettings : _*) settings( - organization := "org.example", - version := "1.0", - publishTo <<= baseDirectory in ThisBuild apply { base => - Some(Resolver.file("file", base / "repo")(Resolver.ivyStylePatterns)) - } - ) - lazy val use = Project("use", file("use")) settings(baseSettings : _*) settings( - libraryDependencies += "org.example" %% "dep" % "1.0", - externalIvySettings(), - publishTo <<= baseDirectory { base => - Some(Resolver.file("file", base / "repo")(Resolver.ivyStylePatterns)) - }, - TaskKey[Unit]("check") <<= baseDirectory map {base => - val inCache = ( (base / "target" / "use-cache") ** "*.jar").get - assert(inCache.isEmpty, "Cache contained jars: " + inCache) - } - ) - lazy val baseSettings = Seq( - autoScalaLibrary := false, - ivyScala := None, - unmanagedJars in Compile <++= scalaInstance map (_.allJars.toSeq), - publishArtifact in packageSrc := false, - publishArtifact in packageDoc := false, - publishMavenStyle := false - ) -}