From ad31b2d1add50b7df85fdfd2c31bf047cc50fda6 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Wed, 29 May 2019 17:30:02 +0200
Subject: [PATCH 1/3] Fix #313: Upgrade to sbt-dotty 0.3.2

This includes https://github.com/lampepfl/dotty/pull/6577 which fixes
"sbt console" in Scala 2 projects.
---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index 12b171d4e..3d7dda9d8 100644
--- a/project/plugins.sbt
+++ b/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")

From e2d340fde9bb7e00cfe299b7303bf8a0e4cbd968 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Wed, 29 May 2019 17:38:38 +0200
Subject: [PATCH 2/3] Upgrade to Dotty 0.15.0-RC1

---
 .travis.yml | 6 +++---
 build.sbt   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95e17b1f9..13cde04cd 100644
--- a/.travis.yml
+++ b/.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: 
diff --git a/build.sbt b/build.sbt
index d1eff4661..590bb9d18 100644
--- a/build.sbt
+++ b/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",

From 97624387c3b9e6b8e0f109302bd78cd67f31c31c Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Wed, 29 May 2019 17:43:23 +0200
Subject: [PATCH 3/3] Add test cases coming from the Dotty test suite

These tests will be removed from Dotty once Dotty stops depending on
scala-xml, so preserve them here.
---
 shared/src/test/scala/scala/xml/XMLTest.scala | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/shared/src/test/scala/scala/xml/XMLTest.scala b/shared/src/test/scala/scala/xml/XMLTest.scala
index 3a8c42917..a9644ca6d 100644
--- a/shared/src/test/scala/scala/xml/XMLTest.scala
+++ b/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"/>
+  }
 }