Support Scala 2.13.0-M5

Author: stringbean

build.sbt

@@ -5,7 +5,7 @@ organization := "software.purpledragon.xml"
 version := "0.0.3-SNAPSHOT"
 
 scalaVersion := "2.12.7"
-crossScalaVersions := Seq(scalaVersion.value, "2.11.12")
+crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.13.0-M5")
 
 // dependencies common for all sub-projects
 libraryDependencies ++= Seq(

project/SettingsPlugin.scala

@@ -8,7 +8,15 @@ object SettingsPlugin extends AutoPlugin {
   override def trigger: PluginTrigger = AllRequirements
   override def requires: Plugins = JvmPlugin
 
-  val javaVersion = "1.8"
+  private val javaVersion = "1.8"
+  private val scalatestStable = "3.0.5"
+  private val scalatestSnapshot = "3.0.6-SNAP4"
+
+  object autoImport {
+    val scalatestVersion = settingKey[String]("Version of scalatest to use")
+  }
+
+  import autoImport._
 
   override def projectSettings: Seq[Setting[_]] = Seq(
     organization := (organization in LocalRootProject).value,
@@ -33,6 +41,12 @@ object SettingsPlugin extends AutoPlugin {
     organizationName := "Purple Dragon Software",
     organizationHomepage := Some(url("https://purpledragon.software")),
     homepage := Some(url("https://stringbean.github.io/scala-xml-compare")),
-    scmInfo := Some(ScmInfo(url("https://github.com/stringbean/scala-xml-compare"), "https://github.com/stringbean/scala-xml-compare.git"))
+    scmInfo := Some(ScmInfo(url("https://github.com/stringbean/scala-xml-compare"), "https://github.com/stringbean/scala-xml-compare.git")),
+    scalatestVersion := {
+      scalaVersion.value match {
+        case "2.13.0-M5" => scalatestSnapshot
+        case _ => scalatestStable
+      }
+    }
   )
 }

xml-compare/build.sbt

@@ -1,5 +1,5 @@
 name := "xml-compare"
 
 libraryDependencies ++= Seq(
-  "org.scalatest" %% "scalatest" % "3.0.5" % "test"
+  "org.scalatest" %% "scalatest" % scalatestVersion.value % Test
 )

xml-compare/src/main/scala/software/purpledragon/xml/compare/XmlCompare.scala

@@ -57,9 +57,9 @@ object XmlCompare {
     if (leftChildren.size != rightChildren.size) {
       XmlDiffers("child count", leftChildren.size, rightChildren.size)
     } else {
-      val meh: Seq[(Node, Node)] = leftChildren.zip(rightChildren)
+      val matchedChildren = leftChildren.zip(rightChildren)
 
-      meh.foldLeft[XmlDiff](XmlEqual) { case (status, (leftChild, rightChild)) =>
+      matchedChildren.foldLeft[XmlDiff](XmlEqual) { case (status, (leftChild, rightChild)) =>
         if (!status.isEqual) {
           // already failed
           status

xml-scalatest/build.sbt

@@ -1,5 +1,5 @@
 name := "xml-scalatest"
 
 libraryDependencies ++= Seq(
-  "org.scalatest" %% "scalatest"  % "3.0.5" % "provided"
+  "org.scalatest" %% "scalatest"  % scalatestVersion.value % Provided
 )