Skip to content

Commit

Permalink
Make partest version a setting
Browse files Browse the repository at this point in the history
Note: this fixes the breakage introduced by ae7b468 (could not `test`).
Apparently, the order of the test dependencies matters...
(Perhaps because of the conflicting binary version of xml/parsers?)
  • Loading branch information
adriaanm committed Sep 26, 2013
1 parent 882daf3 commit de5f638
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 6 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,16 @@ pomExtra := (
// default value must be set here
TestKeys.includeTestDependencies := true

// default
TestKeys.partestVersion := "1.0.0-RC6"

// the actual partest the interface calls into -- must be binary version close enough to ours
// so that it can link to the compiler/lib we're using (testing)
// NOTE: not sure why, but the order matters (maybe due to the binary version conflicts for xml/parser combinators pulled in for scaladoc?)
libraryDependencies ++= (
if (TestKeys.includeTestDependencies.value)
Seq("org.scala-lang.modules" %% "scala-partest" % "1.0-RC5" % "test",
"org.scala-lang.modules" %% "scala-partest-interface" % "0.2" % "test")
Seq("org.scala-lang.modules" %% "scala-partest-interface" % "0.2" % "test",
"org.scala-lang.modules" %% "scala-partest" % TestKeys.partestVersion.value % "test")
else Seq.empty
)

Expand Down
2 changes: 2 additions & 0 deletions project/keys.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ object TestKeys {

// for testing with partest
val includeTestDependencies = settingKey[Boolean]("Doesn't declare test dependencies.")

val partestVersion = settingKey[String]("Partest version.")
}

0 comments on commit de5f638

Please sign in to comment.