@@ -84,7 +84,7 @@ libraryDependencies ++= Seq("junit" % "junit" % "4.11" % "test", "com.novocode"
84
84
TestKeys .includeTestDependencies := true
85
85
86
86
// default
87
- TestKeys .partestVersion := " 1.0.0-RC6 "
87
+ TestKeys .partestVersion := " 1.0.0-RC7 "
88
88
89
89
// the actual partest the interface calls into -- must be binary version close enough to ours
90
90
// so that it can link to the compiler/lib we're using (testing)
@@ -107,15 +107,14 @@ libraryDependencies ++= (
107
107
* 2. Declare dependencies in partest as provided so they are not includeded transitively.
108
108
*/
109
109
def excludeScalaXml (dep : ModuleID ): ModuleID =
110
- dep.exclude(" org.scala-lang.modules" , " scala-parser-combinators_2.11.0-M4" ).
111
- exclude(" org.scala-lang.modules" , " scala-parser-combinators_2.11.0-M5" ).
112
- exclude(" org.scala-lang.modules" , " scala-parser-combinators_2.11.0-M6" )
113
- Seq (" org.scala-lang.modules" % " scala-partest-interface_2.11.0-M5" % " 0.2" % " test" intransitive,
114
- " org.scala-lang.modules" % " scala-partest_2.11.0-M5" % TestKeys .partestVersion.value % " test" intransitive,
115
- // diffutils is needed by partest
116
- " com.googlecode.java-diff-utils" % " diffutils" % " 1.3.0" % " test" ,
117
- " org.scala-lang" % " scala-compiler" % scalaVersion.value % " test" ).
118
- map(excludeScalaXml)
110
+ (dep exclude(" org.scala-lang.modules" , " scala-parser-combinators_2.11.0-M4" )
111
+ exclude(" org.scala-lang.modules" , " scala-parser-combinators_2.11.0-M5" )
112
+ exclude(" org.scala-lang.modules" , " scala-parser-combinators_2.11.0-M6" ))
113
+ // (this space intentionally not left blank)
114
+ Seq (" org.scala-lang.modules" % s " scala-partest-interface_ ${scalaBinaryVersion.value}" % " 0.2" % " test" intransitive,
115
+ " org.scala-lang.modules" % s " scala-partest_ ${scalaBinaryVersion.value}" % TestKeys .partestVersion.value % " test" intransitive,
116
+ " com.googlecode.java-diff-utils" % " diffutils" % " 1.3.0" % " test" , // diffutils is needed by partest
117
+ " org.scala-lang" % " scala-compiler" % scalaVersion.value % " test" ).map(excludeScalaXml)
119
118
}
120
119
else Seq .empty
121
120
)
0 commit comments