diff --git a/.travis.yml b/.travis.yml index 6731bef8d7..553dbe2b7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,11 @@ stages: if: (branch = master AND type = push) OR (tag IS present) jobs: include: + - env: SCALA_VERSION=2.13 + sudo: required + services: docker + before_install: ./scripts/setup-sbt-extra.sh + script: bin/sbt scala213 testsJVM/test - env: SCALA_VERSION=2.12 NATIVE=1 sudo: required before_install: curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x diff --git a/appveyor.yml b/appveyor.yml index 75ec456ad6..e4a7d94aa4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,8 +30,10 @@ build_script: - sbt scala212 coreJVM/publishLocal cacheJVM/publishLocal extra/publishLocal scalazJVM/publishLocal cli/publishLocal - sbt scala211 compile coreJVM/publishLocal test_script: + - sbt scala213 testsJVM/test - sbt scala212 testsJVM/test - sbt scala211 testsJVM/test + - sbt scala213 testsJVM/it:test - sbt scala212 testsJVM/it:test - sbt scala211 testsJVM/it:test branches: diff --git a/modules/core/jvm/src/main/scala/coursier/core/compatibility/package.scala b/modules/core/jvm/src/main/scala/coursier/core/compatibility/package.scala index c105e6dae5..07f3c9cc75 100644 --- a/modules/core/jvm/src/main/scala/coursier/core/compatibility/package.scala +++ b/modules/core/jvm/src/main/scala/coursier/core/compatibility/package.scala @@ -57,7 +57,7 @@ package object compatibility { helper(node.attributes).toVector } def label = node.label - def children = node.child.map(fromNode) + def children = node.child.map(fromNode).toSeq def isText = node match { case _: scala.xml.Text => true; case _ => false } def textContent = node.text def isElement = node match { case _: scala.xml.Elem => true; case _ => false } diff --git a/project/ScalaVersion.scala b/project/ScalaVersion.scala index 99bba2bb12..6a4e40adb7 100644 --- a/project/ScalaVersion.scala +++ b/project/ScalaVersion.scala @@ -1,10 +1,11 @@ object ScalaVersion { + def scala213 = "2.13.0-M5" def scala212 = "2.12.8" def scala211 = "2.11.12" - val versions = Seq(scala212, scala211) + val versions = Seq(scala213, scala212, scala211) val map = versions .map { v =>