add cross compile for scala 2.11.0

(cherry picked from commit e3b4374)

Conflicts:
	project/ScalesXmlRoot.scala
	project/build.properties
	project/plugins.sbt

README.md

@@ -12,22 +12,22 @@ A number of the pain points of Scala XML are also simply removed, want to change
 
 A very flexible XML stream handling approach is based upon StAX and Iteratees (courtesy of Scalaz) which uses the same model as the tree based, no separate event hierarchy needed.
 
-Currently the stable 0.4.5 release [site](http://scala-scales.googlecode.com/svn/sites/scales/scales-xml_2.9.2/0.3/index.html) improves on 0.2.1's fast parsing and low memory usage (which, of course, are coupled) and adds ScalesXPath - a string based XPath 1.0 evaluator, a full compliment of useful axe in the internal XPath syntax, an equality framework (2.9.x only) and general improvements in usability.
+Currently the stable 0.6.0-M1 release [site](http://scala-scales.googlecode.com/svn/sites/scales/scales-xml_2.9.2/0.3/index.html) improves on 0.2.1's fast parsing and low memory usage (which, of course, are coupled) and adds ScalesXPath - a string based XPath 1.0 evaluator, a full compliment of useful axe in the internal XPath syntax, an equality framework (2.9.x only) and general improvements in usability.
 
 The artifacts are now on Maven Central under the group org.scales.xml.
 
 # How To Use
 
-Currently 2.8.1, 2.8.2, 2.9.1, 2.9.2 and 2.10.0-M6 are built against.
+Currently 2.9.2, 2.10.4 and 2.11.0 are built against.
 
 So for sbt its:
 
-    val scalesXml = "org.scalesxml" %% "scales-xml" % "0.4.5"
+    val scalesXml = "org.scalesxml" %% "scales-xml" % "0.6.0-M1"
 
 xsbt 0.10+ its:
 
     libraryDependencies ++= Seq(
-      "org.scalesxml" %% "scales-xml" % "0.4.5",
+      "org.scalesxml" %% "scales-xml" % "0.6.0-M1",
       //"org.scalesxml" %% "scales-jaxen" % "0.5.1" // optional for string based xpaths
       )
 

core/src/main/scala/scales/utils/collection/ListSet.scala

@@ -26,8 +26,8 @@ object ListSet {
  *  @author <- corrupted by Chris Twiner with a number of PaulPs fixes
  *  @version 1.0, 30/12/2010
  */
-@serializable
-class ListSet[A : Equal](val plusFast : Boolean = false) extends Iterable[A]{ self =>
+//@serializable
+class ListSet[A : Equal](val plusFast : Boolean = false) extends Iterable[A] with Serializable { self =>
 
   val equal = implicitly[Equal[A]]
 
@@ -112,8 +112,8 @@ class ListSet[A : Equal](val plusFast : Boolean = false) extends Iterable[A]{ se
 
   /** Represents an entry in the `ListSet`.
    */
-  @serializable
-  protected class Node(override protected val elem: A) extends ListSet[A] {
+  //@serializable
+  protected class Node(override protected val elem: A) extends ListSet[A] with Serializable {
 
     override private[ListSet] def unchecked_outer = self
 

jaxen/build.sbt

@@ -1,4 +1,4 @@
 libraryDependencies ++= Seq(
   // from our repo
-  "jaxen" % "jaxen" % "1.1.3" intransitive()
-)
+  "jaxen" % "jaxen" % "1.1.6" intransitive()
+)

project/ScalesXmlRoot.scala

@@ -30,17 +30,17 @@ object ScalesXmlRoot extends Build {
 
   lazy val coreTests = Project("scales-xml-tests", file("core-tests"), settings = standardSettings ++ dontPublishSettings) dependsOn(core)
 
-  lazy val saxonTests = Project("saxon-tests", file("saxon-tests"), settings = standardSettings ++ dontPublishSettings ++ dontBuildIn28) dependsOn(coreTests % "test->test")
+  lazy val saxonTests = Project("saxon-tests", file("saxon-tests"), settings = standardSettings ++ dontPublishSettings) dependsOn(coreTests % "test->test")
 
   lazy val xercesTests = Project("xerces-tests", file("xerces-tests"), settings = standardSettings ++ dontPublishSettings ++ dontBuildIn28) dependsOn(coreTests % "test->test")
 
   lazy val jaxen = Project("scales-jaxen", file("jaxen"), settings = standardSettings ++ deployOrg) dependsOn(core)
 
-  lazy val jaxenTests = Project("jaxen-tests", file("jaxen-tests"), settings = standardSettings ++ dontPublishSettings ++ dontBuildIn28) dependsOn(jaxen % "compile->test", coreTests % "test->test") //  % "compile->compile;test->test"
+  lazy val jaxenTests = Project("jaxen-tests", file("jaxen-tests"), settings = standardSettings ++ dontPublishSettings) dependsOn(jaxen % "compile->test", coreTests % "test->test") //  % "compile->compile;test->test"
 
   lazy val aalto = Project("scales-aalto", file("aalto"), settings = standardSettings ++ deployOrg) dependsOn(core)
 
-  lazy val aaltoTests = Project("aalto-tests", file("aalto-tests"), settings = standardSettings ++ dontPublishSettings ++ dontBuildIn28) dependsOn(aalto % "compile->test", coreTests % "test->test")
+  lazy val aaltoTests = Project("aalto-tests", file("aalto-tests"), settings = standardSettings ++ dontPublishSettings) dependsOn(aalto % "compile->test", coreTests % "test->test")
 
   /* project that sucks in the others like fullDocsAndSxr for the purpose of coverage tests
   lazy val coverageProject = {
@@ -80,12 +80,6 @@ object ScalesXmlRoot extends Build {
       )
   )
 
-  lazy val dontBuildIn28 =
-    Seq(
-      skip <<= scalaVersion map { v => v startsWith "2.8." },
-      skip in (Compile, update) <<= scalaVersion map { v => v startsWith "2.8." },
-      skip in (Test, update) <<= scalaVersion map { v => v startsWith "2.8." })
-
   lazy val dontPublishSettings = Seq(
     publishArtifact in Compile := false,
     publishArtifact in Test := false,
@@ -119,7 +113,7 @@ object ScalesXmlRoot extends Build {
     version := "0.5.0-RC1",
     scalaVersion := "2.10.4",
 //    scalaVersion := "2.10.0-M7", 
-    crossScalaVersions := Seq("2.9.3","2.10.4"),
+    crossScalaVersions := Seq("2.9.3","2.10.4", "2.11.0"),
     //publishSetting,
 //    parallelExecution in Test := false,
 //    scalacOptions ++= Seq("-optimise"), 2.10.2-RC2 

project/plugins.sbt

@@ -16,4 +16,4 @@ resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifa
 addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
 //addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")
 
-addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.1.6")
+addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.1.6")