Make scalaXmlVersion logic friendly to future 2.12 releases

retronym · retronym · commit 277e81345a74 · 2016-02-06T13:38:57.000+10:00
Otherwise, we'll fall back to the non-existent scala-xml 1.0.4
when bootstrapping the modules with new releases of Scala 2.12.
diff --git a/build.sbt b/build.sbt
@@ -13,13 +13,13 @@ crossScalaVersions         := {
   if (java.startsWith("1.6."))
     Seq("2.11.7", "2.12.0-M1")
   else if (java.startsWith("1.8."))
-    Seq("2.12.0-M2", "2.12.0-M3")
+    Seq("2.12.0-M3")
   else
     sys.error(s"don't know what Scala versions to build on $java")
 }
 
 scalaXmlVersion            := {
-  if(scalaVersion.value == "2.12.0-M3") "1.0.5" else "1.0.4"
+  if(scalaVersion.value.startsWith("2.11.") || scalaVersion.value == "2.12.0-M2") "1.0.4" else "1.0.5"
 }
 
 scalaCheckVersion          := "1.11.6"

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,13 @@ crossScalaVersions := {`
`13`	`13`	`if (java.startsWith("1.6."))`
`14`	`14`	`Seq("2.11.7", "2.12.0-M1")`
`15`	`15`	`else if (java.startsWith("1.8."))`
`16`		`- Seq("2.12.0-M2", "2.12.0-M3")`
	`16`	`+ Seq("2.12.0-M3")`
`17`	`17`	`else`
`18`	`18`	`sys.error(s"don't know what Scala versions to build on $java")`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`scalaXmlVersion := {`
`22`		`- if(scalaVersion.value == "2.12.0-M3") "1.0.5" else "1.0.4"`
	`22`	`+ if(scalaVersion.value.startsWith("2.11.") \|\| scalaVersion.value == "2.12.0-M2") "1.0.4" else "1.0.5"`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`scalaCheckVersion := "1.11.6"`