From 82dcf8d2505167ea85ce656920db5b4c7e541b9e Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 10 Dec 2013 11:59:27 -0500 Subject: [PATCH] delete dependency-management/inherit-repo test repository used in the test doesn't exist anymore and project delegation is deprecated --- .../inherit-repo/changes/WithRepository.sbt | 1 - .../inherit-repo/project/TestProject.scala | 19 ---------------- .../dependency-management/inherit-repo/test | 22 ------------------- 3 files changed, 42 deletions(-) delete mode 100644 sbt/src/sbt-test/dependency-management/inherit-repo/changes/WithRepository.sbt delete mode 100644 sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala delete mode 100644 sbt/src/sbt-test/dependency-management/inherit-repo/test diff --git a/sbt/src/sbt-test/dependency-management/inherit-repo/changes/WithRepository.sbt b/sbt/src/sbt-test/dependency-management/inherit-repo/changes/WithRepository.sbt deleted file mode 100644 index 1d498ec55..000000000 --- a/sbt/src/sbt-test/dependency-management/inherit-repo/changes/WithRepository.sbt +++ /dev/null @@ -1 +0,0 @@ -externalResolvers := ("Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/") :: Nil \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala b/sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala deleted file mode 100644 index 5b0b45083..000000000 --- a/sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala +++ /dev/null @@ -1,19 +0,0 @@ - import sbt._ - import Keys._ - -object TestProject extends Build -{ - override lazy val settings = super.settings ++ Seq( - externalResolvers := Nil, - autoScalaLibrary := false, - ivyScala := None, - ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy-home"))) - ) - - lazy val root = Project("root", file(".")) aggregate(a, b) - - lazy val a = Project("a", file("a")) delegateTo(b) settings( - libraryDependencies += "com.camptocamp.tl.caltar" % "core" % "0.5" intransitive() - ) - lazy val b = Project("b", file("b")) -} \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/inherit-repo/test b/sbt/src/sbt-test/dependency-management/inherit-repo/test deleted file mode 100644 index 2980cc764..000000000 --- a/sbt/src/sbt-test/dependency-management/inherit-repo/test +++ /dev/null @@ -1,22 +0,0 @@ -> set logLevel := Level.Debug -# This should fail because project A declares a dependency that exists in an extra repository, which we haven't declared --> show update - -# Copy the project definition with the extra repository declared in project B and with A delegating to B and reload -$ copy-file changes/WithRepository.sbt b/build.sbt -> reload - -# Try updating again, which should work because the repository declared in B should be shared by A -> update - -# Copy the project definition with the extra repository declared in both A and B and reload -$ copy-file changes/WithRepository.sbt a/build.sbt -> reload - -> update - -# Copy the project definition with the extra repository declared in A only and reload -$ delete b/build.sbt -> reload - -> update \ No newline at end of file