From 03755cf9f20d6591ed7d447b9762772f5908d7d7 Mon Sep 17 00:00:00 2001 From: David Strawn Date: Sun, 6 Sep 2020 11:31:05 -0600 Subject: [PATCH] Update For Dotty 0.27.0-RC1 The only changes where some ambiguous references to symbols. --- .circleci/config.yml | 10 +++++----- .travis.yml | 6 +++--- build.sbt | 2 +- jvm/src/test/scala/scala/xml/XMLTest.scala | 2 +- .../main/scala/scala/xml/parsing/MarkupParser.scala | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b3ba5d538..c19e71ba3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -89,9 +89,9 @@ workflows: java_version: jdk8 scala_version: 2.13.1 - scala_job: - name: dotty-0.23 + name: dotty-0.27.0-RC1 java_version: jdk8 - scala_version: 0.23.0-RC1 + scala_version: 0.27.0-RC1 - scala_job: name: jdk11_2.12 java_version: jdk11 @@ -103,7 +103,7 @@ workflows: - scala_job: name: jdk11_dotty java_version: jdk11 - scala_version: 0.23.0-RC1 + scala_version: 0.27.0-RC1 - scala_job: name: jdk13_2.12 java_version: jdk13 @@ -115,7 +115,7 @@ workflows: - scala_job: name: jdk13_dotty java_version: jdk13 - scala_version: 0.23.0-RC1 + scala_version: 0.27.0-RC1 - scala_job: name: jdk14_2.12 java_version: jdk14 @@ -127,7 +127,7 @@ workflows: - scala_job: name: jdk14_dotty java_version: jdk14 - scala_version: 0.23.0-RC1 + scala_version: 0.27.0-RC1 - scalajs_job: name: sjs0.6_2.12 scala_version: 2.12.10 diff --git a/.travis.yml b/.travis.yml index 21f130d58..5876bfbd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml language: scala scala: - - 0.23.0-RC1 + - 0.27.0-RC1 - 2.12.10 - 2.13.1 @@ -18,9 +18,9 @@ env: matrix: exclude: - - scala: 0.23.0-RC1 + - scala: 0.27.0-RC1 env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8 - - scala: 0.23.0-RC1 + - scala: 0.27.0-RC1 env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8 install: diff --git a/build.sbt b/build.sbt index 228b35378..eb817b708 100644 --- a/build.sbt +++ b/build.sbt @@ -163,7 +163,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) ) .jsSettings( // The config for Travis has an exclude, but sbt-travisci doesn't catch it. - crossScalaVersions -= "0.23.0-RC1", + crossScalaVersions -= "0.27.0-RC1", // Scala.js cannot run forked tests fork in Test := false ) diff --git a/jvm/src/test/scala/scala/xml/XMLTest.scala b/jvm/src/test/scala/scala/xml/XMLTest.scala index 26336807f..0ccbc0767 100644 --- a/jvm/src/test/scala/scala/xml/XMLTest.scala +++ b/jvm/src/test/scala/scala/xml/XMLTest.scala @@ -35,7 +35,7 @@ class XMLTestJVM { val c = new Node { def label = "hello" override def hashCode() = - Utility.hashCode(prefix, label, attributes.hashCode(), scope.hashCode(), child); + Utility.hashCode(prefix, label, this.attributes.hashCode(), scope.hashCode(), child); def child = Elem(null, "world", e, sc); //def attributes = e; override def text = "" diff --git a/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala b/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala index 66ceb4c78..545abdbcf 100755 --- a/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala +++ b/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala @@ -548,7 +548,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests { } xToken('>') this.dtd = new DTD { - /*override var*/ externalID = extID + this.externalID = extID /*override val */ decls = handle.decls.reverse } //this.dtd.initializeEntities();