From ab0d61c3fe457a2355fc82b166a6f66f758fe990 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 28 Jun 2013 09:08:29 -0400 Subject: [PATCH] define test-interface dependency in build in one place --- project/Sbt.scala | 6 ++---- project/Util.scala | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/project/Sbt.scala b/project/Sbt.scala index 82bb9d689..f4f07edce 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -79,11 +79,9 @@ object Sbt extends Build // Apache Ivy integration lazy val ivySub = baseProject(file("ivy"), "Ivy") dependsOn(interfaceSub, launchInterfaceSub, crossSub, logSub % "compile;test->test", ioSub % "compile;test->test", launchSub % "test->test") settings(ivy, jsch, testExclusive) // Runner for uniform test interface - lazy val testingSub = baseProject(file("testing"), "Testing") dependsOn(ioSub, classpathSub, logSub, launchInterfaceSub, testAgentSub) settings(libraryDependencies += "org.scalatest" % "test-interface" % "1.0-SNAP7") + lazy val testingSub = baseProject(file("testing"), "Testing") dependsOn(ioSub, classpathSub, logSub, launchInterfaceSub, testAgentSub) settings(testInterface) // Testing agent for running tests in a separate process. - lazy val testAgentSub = project(file("testing/agent"), "Test Agent") settings( - libraryDependencies += "org.scalatest" % "test-interface" % "1.0-SNAP7" - ) + lazy val testAgentSub = project(file("testing/agent"), "Test Agent") settings(testInterface) // Basic task engine lazy val taskSub = testedBaseProject(tasksPath, "Tasks") dependsOn(controlSub, collectionSub) diff --git a/project/Util.scala b/project/Util.scala index 71c85f385..2949aa99f 100644 --- a/project/Util.scala +++ b/project/Util.scala @@ -162,6 +162,7 @@ object Common lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.46" intransitive() ) lazy val sbinary = lib("org.scala-tools.sbinary" %% "sbinary" % "0.4.1" ) lazy val scalaCompiler = libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ ) + lazy val testInterface = lib("org.scalatest" % "test-interface" % "1.0-SNAP7") } object Licensed {