Patch needed for releasing scala/scala-parser-combinators@de5f638 against Scala 2.11.0-M6.

scala-parser-combinators_2.11.0-M6.patch

diff --git a/build.sbt b/build.sbt
index 7b3dd09..d7cfadc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,14 +2,16 @@ organization := "org.scala-lang.modules"
 
 name := "scala-parser-combinators"
 
-version := "1.0.0-SNAPSHOT"
+version := "1.0.0-RC3"
 
-scalaVersion := "2.11.0-M5"
+scalaVersion := "2.11.0-M6"
 
 // NOTE: not necessarily equal to scalaVersion
 // (e.g., during PR validation, we override scalaVersion to validate,
 // but don't rebuild scalacheck, so we don't want to rewire that dependency)
-scalaBinaryVersion := "2.11.0-M5"
+scalaBinaryVersion := scalaVersion.value
+
+//conflictWarning ~= { _.copy(failOnConflict = false) }
 
 // 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")
@@ -40,6 +42,8 @@ publishTo := {
     Some("releases" at nexus + "service/local/staging/deploy/maven2")
 }
 
+credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
+
 publishMavenStyle := true
 
 publishArtifact in Test := false
@@ -86,15 +90,25 @@ TestKeys.partestVersion := "1.0.0-RC6"
 // 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-interface" % "0.2"                         % "test",
-        "org.scala-lang.modules" %% "scala-partest"           % TestKeys.partestVersion.value % "test")
+  if (TestKeys.includeTestDependencies.value) {
+    def excludeScalaModules(dep: ModuleID): ModuleID = 
+      dep.exclude("org.scala-lang.modules", "scala-xml_2.11.0-M5").
+      exclude("org.scala-lang.modules", "scala-xml_2.11.0-M4").
+      exclude("org.scala-lang.modules", "scala-parser-combinators_2.11.0-M5").
+      exclude("org.scala-lang.modules", "scala-parser-combinators_2.11.0-M4").
+      exclude("org.scala-lang", "scala-library").
+      exclude("org.scala-lang", "scala-compiler").
+      exclude("org.scala-lang", "scalap")
+    Seq("org.scala-lang.modules" % "scala-partest-interface_2.11.0-M5" % "0.2"                         % "test",
+        "org.scala-lang.modules" % "scala-partest_2.11.0-M5"           % TestKeys.partestVersion.value % "test").
+      map(excludeScalaModules) :+ ("org.scala-lang" % "scala-compiler" % "2.11.0-M6")
+  }
   else Seq.empty
 )
 
 
 // necessary for partest -- see comments in its build.sbt
-conflictWarning ~= { _.copy(failOnConflict = false) }
+//conflictWarning ~= { _.copy(failOnConflict = false) }
 
 fork in Test := true