From 814ceeab79f2a4ef091807e7824d77d364302ffe Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 1 Oct 2015 23:28:27 -0400 Subject: [PATCH] librarymanagement 0.1.0-M3 to use internal syntax --- main/src/main/scala/sbt/Defaults.scala | 1 + project/Dependencies.scala | 2 +- .../dependency-management/inline-dependencies-a/build.sbt | 2 ++ sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt | 2 ++ sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt | 2 ++ .../sbt-test/dependency-management/sources/project/Test.scala | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 8276e83e2..7c15ffa90 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -25,6 +25,7 @@ import testing.{ Framework, Runner, AnnotatedFingerprint, SubclassFingerprint } import sbt.librarymanagement._ import sbt.internal.librarymanagement._ +import sbt.internal.librarymanagement.syntax._ import sbt.internal.util._ import sbt.util.Level diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c6304bb0c..6d43d0297 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ object Dependencies { val utilVersion = "0.1.0-M5" val ioVersion = "1.0.0-M3" val incremenalcompilerVersion = "0.1.0-M1-168cb7a4877917e01917e35b9b82a62afe5c2a01" - val librarymanagementVersion = "0.1.0-M2" + val librarymanagementVersion = "0.1.0-M3" lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion lazy val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion diff --git a/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt b/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt index 9ea22504b..a0b74a7b7 100644 --- a/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt +++ b/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt @@ -1,3 +1,5 @@ +import sbt.internal.librarymanagement.syntax._ + libraryDependencies += "org.scalacheck" % "scalacheck" % "1.5" ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy-home"))) diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt index 7c11071a3..43349d48c 100644 --- a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt +++ b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt @@ -1,3 +1,5 @@ +import sbt.internal.librarymanagement.syntax._ + seq(externalIvySettings(), externalIvyFile()) TaskKey[Unit]("check") := { diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt index 955227dfa..ff8f57015 100644 --- a/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt +++ b/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt @@ -1,3 +1,5 @@ +import sbt.internal.librarymanagement.syntax._ + externalIvySettings() libraryDependencies += "org.scalacheck" % "scalacheck" % "1.5" diff --git a/sbt/src/sbt-test/dependency-management/sources/project/Test.scala b/sbt/src/sbt-test/dependency-management/sources/project/Test.scala index 11b463829..2342d9233 100644 --- a/sbt/src/sbt-test/dependency-management/sources/project/Test.scala +++ b/sbt/src/sbt-test/dependency-management/sources/project/Test.scala @@ -1,6 +1,7 @@ import sbt._ import Import._ import Keys._ +import sbt.internal.librarymanagement.syntax._ object Test extends Build {