Skip to content

Commit 03755cf

Browse files
committed
Update For Dotty 0.27.0-RC1
The only changes where some ambiguous references to symbols.
1 parent 0125cf6 commit 03755cf

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

.circleci/config.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ workflows:
8989
java_version: jdk8
9090
scala_version: 2.13.1
9191
- scala_job:
92-
name: dotty-0.23
92+
name: dotty-0.27.0-RC1
9393
java_version: jdk8
94-
scala_version: 0.23.0-RC1
94+
scala_version: 0.27.0-RC1
9595
- scala_job:
9696
name: jdk11_2.12
9797
java_version: jdk11
@@ -103,7 +103,7 @@ workflows:
103103
- scala_job:
104104
name: jdk11_dotty
105105
java_version: jdk11
106-
scala_version: 0.23.0-RC1
106+
scala_version: 0.27.0-RC1
107107
- scala_job:
108108
name: jdk13_2.12
109109
java_version: jdk13
@@ -115,7 +115,7 @@ workflows:
115115
- scala_job:
116116
name: jdk13_dotty
117117
java_version: jdk13
118-
scala_version: 0.23.0-RC1
118+
scala_version: 0.27.0-RC1
119119
- scala_job:
120120
name: jdk14_2.12
121121
java_version: jdk14
@@ -127,7 +127,7 @@ workflows:
127127
- scala_job:
128128
name: jdk14_dotty
129129
java_version: jdk14
130-
scala_version: 0.23.0-RC1
130+
scala_version: 0.27.0-RC1
131131
- scalajs_job:
132132
name: sjs0.6_2.12
133133
scala_version: 2.12.10

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
55
language: scala
66

77
scala:
8-
- 0.23.0-RC1
8+
- 0.27.0-RC1
99
- 2.12.10
1010
- 2.13.1
1111

@@ -18,9 +18,9 @@ env:
1818

1919
matrix:
2020
exclude:
21-
- scala: 0.23.0-RC1
21+
- scala: 0.27.0-RC1
2222
env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8
23-
- scala: 0.23.0-RC1
23+
- scala: 0.27.0-RC1
2424
env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
2525

2626
install:

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
163163
)
164164
.jsSettings(
165165
// The config for Travis has an exclude, but sbt-travisci doesn't catch it.
166-
crossScalaVersions -= "0.23.0-RC1",
166+
crossScalaVersions -= "0.27.0-RC1",
167167
// Scala.js cannot run forked tests
168168
fork in Test := false
169169
)

jvm/src/test/scala/scala/xml/XMLTest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class XMLTestJVM {
3535
val c = new Node {
3636
def label = "hello"
3737
override def hashCode() =
38-
Utility.hashCode(prefix, label, attributes.hashCode(), scope.hashCode(), child);
38+
Utility.hashCode(prefix, label, this.attributes.hashCode(), scope.hashCode(), child);
3939
def child = Elem(null, "world", e, sc);
4040
//def attributes = e;
4141
override def text = ""

shared/src/main/scala/scala/xml/parsing/MarkupParser.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
548548
}
549549
xToken('>')
550550
this.dtd = new DTD {
551-
/*override var*/ externalID = extID
551+
this.externalID = extID
552552
/*override val */ decls = handle.decls.reverse
553553
}
554554
//this.dtd.initializeEntities();

0 commit comments

Comments
 (0)