Bump to 1.0-RC4, upgrade partest to 1.0-RC5

Author: adriaanm

build.sbt

@@ -2,7 +2,7 @@ organization := "org.scala-lang.modules"
 
 name := "scala-xml"
 
-version := "1.0-RC3"
+version := "1.0-RC4"
 
 // standard stuff follows:
 scalaVersion := "2.11.0-M5"
@@ -12,6 +12,7 @@ scalaVersion := "2.11.0-M5"
 // but don't rebuild scalacheck, so we don't want to rewire that dependency)
 scalaBinaryVersion := "2.11.0-M5"
 
+
 // don't use for doc scope, scaladoc warnings are not to be reckoned with
 scalacOptions in compile ++= Seq("-optimize", "-Xfatal-warnings", "-feature", "-deprecation", "-unchecked", "-Xlint")
 
@@ -82,7 +83,10 @@ libraryDependencies += "org.scala-lang.modules" %% "scala-partest-interface" % "
 
 // 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)
-libraryDependencies += "org.scala-lang.modules" %% "scala-partest" % "1.0-RC2" % "test"
+libraryDependencies += "org.scala-lang.modules" %% "scala-partest" % "1.0-RC5" % "test"
+
+// necessary for partest -- see comments in its build.sbt
+conflictWarning ~= { _.copy(failOnConflict = false) }
 
 fork in Test := true
 

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.0-RC5
+sbt.version=0.13.0