Skip to content

Commit dd1e0e4

Browse files
committed
Make partest version a setting
Note: this fixes the breakage introduced by b9695f0 (could not `test`). Apparently, the order of the test dependencies matters... (Perhaps because of the conflicting binary version of xml/parsers?)
1 parent 0cb0e70 commit dd1e0e4

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

build.sbt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,16 @@ pomExtra := (
8181
// default value must be set here
8282
TestKeys.includeTestDependencies := true
8383

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

project/keys.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ object TestKeys {
33

44
// for testing with partest
55
val includeTestDependencies = settingKey[Boolean]("Doesn't declare test dependencies.")
6+
7+
val partestVersion = settingKey[String]("Partest version.")
68
}

0 commit comments

Comments
 (0)