From e0acb6dcf92608c4b0d86021d07db801d6c1a3dc Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 12 May 2016 12:41:25 -0400 Subject: [PATCH] Mark dependency-management/url pending Ref sbt/sbt#2608, sbt/sbt#2609 --- sbt/src/main/scala/Import.scala | 1 + sbt/src/sbt-test/dependency-management/url/build.sbt | 5 +++-- sbt/src/sbt-test/dependency-management/url/{test => pending} | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename sbt/src/sbt-test/dependency-management/url/{test => pending} (100%) diff --git a/sbt/src/main/scala/Import.scala b/sbt/src/main/scala/Import.scala index be017d8de..cbfbe041a 100644 --- a/sbt/src/main/scala/Import.scala +++ b/sbt/src/main/scala/Import.scala @@ -305,6 +305,7 @@ trait Import { // sbt.internal.librarymanagement type IvyPaths = sbt.internal.librarymanagement.IvyPaths + val UpdateLogging = sbt.internal.librarymanagement.UpdateLogging type IncOptions = xsbti.compile.IncOptions } diff --git a/sbt/src/sbt-test/dependency-management/url/build.sbt b/sbt/src/sbt-test/dependency-management/url/build.sbt index 1b835ea5e..ad1387fb7 100644 --- a/sbt/src/sbt-test/dependency-management/url/build.sbt +++ b/sbt/src/sbt-test/dependency-management/url/build.sbt @@ -3,7 +3,8 @@ import sbt.internal.inc.classpath.ClasspathUtilities lazy val root = (project in file(".")). settings( ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))), - libraryDependencies += "slinky" % "slinky" % "2.1" % "test" from "http://slinky2.googlecode.com/svn/artifacts/2.1/slinky.jar", + libraryDependencies += "org.jsoup" % "jsoup" % "1.9.1" % Test from "http://jsoup.org/packages/jsoup-1.9.1.jar", + ivyLoggingLevel := UpdateLogging.Full, TaskKey[Unit]("check-in-test") <<= checkClasspath(Test), TaskKey[Unit]("check-in-compile") <<= checkClasspath(Compile) ) @@ -13,7 +14,7 @@ def checkClasspath(conf: Configuration) = try { val loader = ClasspathUtilities.toLoader(cp.files) - Class.forName("slinky.http.Application", false, loader) + Class.forName("org.jsoup.Jsoup", false, loader) () } catch diff --git a/sbt/src/sbt-test/dependency-management/url/test b/sbt/src/sbt-test/dependency-management/url/pending similarity index 100% rename from sbt/src/sbt-test/dependency-management/url/test rename to sbt/src/sbt-test/dependency-management/url/pending