Merge pull request #314 from smarter/dotty-fixes

Dotty-related fixes and upgrades

Author: ashawley

.travis.yml

@@ -7,7 +7,7 @@ jdk:
 scala:
   - 2.12.8
   - 2.13.0-RC2
-  - 0.14.0-RC1
+  - 0.15.0-RC1
 
 env:
   global:
@@ -29,9 +29,9 @@ matrix:
       env: SCALAJS_VERSION=0.6.27
     - jdk: openjdk11
       env: SCALAJS_VERSION=1.0.0-M7
-    - scala: 0.14.0-RC1
+    - scala: 0.15.0-RC1
       env: SCALAJS_VERSION=0.6.27
-    - scala: 0.14.0-RC1
+    - scala: 0.15.0-RC1
       env: SCALAJS_VERSION=1.0.0-M7
 
 script: 

build.sbt

@@ -30,7 +30,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
   .settings(scalaModuleSettings)
   .jvmSettings(scalaModuleSettingsJVM)
   .jvmSettings(
-    crossScalaVersions += "0.14.0-RC1"
+    crossScalaVersions += "0.15.0-RC1"
   )
   .settings(
     name    := "scala-xml",

project/plugins.sbt

@@ -6,4 +6,4 @@ val scalaJSVersion =
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.1")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.2")

shared/src/test/scala/scala/xml/XMLTest.scala

@@ -570,4 +570,14 @@ Ours is the portal of hope, come as you are."
     pp.format(x, sb)
     assertEquals(expected, sb.toString)
   }
+
+  @UnitTest
+  def i1976: Unit = {
+     val node = <node>{ "whatever " }</node>
+  }
+
+  @UnitTest
+  def i6547: Unit = {
+    <foo a="hello &name; aaa"/>
+  }
 }