diff --git a/build.sbt b/build.sbt index 8b0c9ce2a..8816e810c 100644 --- a/build.sbt +++ b/build.sbt @@ -47,6 +47,7 @@ def commonSettings: Seq[Setting[_]] = Seq[SettingsDefinition]( bintrayPackage := (bintrayPackage in ThisBuild).value, bintrayRepository := (bintrayRepository in ThisBuild).value, mimaDefaultSettings, + publishArtifact in Test := false, previousArtifact := None, // Some(organization.value % moduleName.value % "1.0.0"), binaryIssueFilters ++= Seq( ) @@ -142,7 +143,7 @@ lazy val runProj = (project in file("run")). testedBaseSettings, name := "Run", libraryDependencies ++= Seq(sbtIO, - utilLogging, (utilLogging % Test).classifier("tests"), compilerClasspath) + utilLogging, compilerClasspath) ) lazy val scriptedSbtProj = (project in scriptedPath / "sbt"). diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d48da4a9c..d7b5ccad0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,10 +9,10 @@ object Dependencies { lazy val scala211 = "2.11.8" // sbt modules - val ioVersion = "1.0.0-M5" - val utilVersion = "0.1.0-M12" - val librarymanagementVersion = "0.1.0-M10" - val zincVersion = "1.0.0-M1" + val ioVersion = "1.0.0-M6" + val utilVersion = "0.1.0-M13" + val librarymanagementVersion = "0.1.0-M11" + val zincVersion = "1.0.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/run/src/test/scala/sbt/ForkTest.scala b/run/src/test/scala/sbt/ForkTest.scala index 01e726ec9..12eb3cee7 100644 --- a/run/src/test/scala/sbt/ForkTest.scala +++ b/run/src/test/scala/sbt/ForkTest.scala @@ -5,7 +5,7 @@ import Prop.{ Exception => _, _ } import Gen.{ alphaNumChar, frequency, nonEmptyListOf } import java.io.File -import sbt.internal.util.TestLogger +import sbt.internal.TestLogger import sbt.io.{ IO, Path } object ForkTest extends Properties("Fork") { diff --git a/run/src/test/scala/sbt/TestLogger.scala b/run/src/test/scala/sbt/TestLogger.scala new file mode 100644 index 000000000..284bd70b6 --- /dev/null +++ b/run/src/test/scala/sbt/TestLogger.scala @@ -0,0 +1,14 @@ +package sbt +package internal + +import sbt.internal.util._ +import sbt.util._ + +object TestLogger { + def apply[T](f: Logger => T): T = + { + val log = new BufferedLogger(ConsoleLogger()) + log.setLevel(Level.Debug) + log.bufferQuietly(f(log)) + } +}