Skip to content

Update For Dotty 0.28.0-bin-20200904-1ab71c1-NIGHTLY #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ workflows:
java_version: jdk8
scala_version: 2.13.1
- scala_job:
name: dotty-0.23
name: dotty-0.28.0-bin-20200904-1ab71c1-NIGHTLY
java_version: jdk8
scala_version: 0.23.0-RC1
scala_version: 0.28.0-bin-20200904-1ab71c1-NIGHTLY
- scala_job:
name: jdk11_2.12
java_version: jdk11
Expand All @@ -103,7 +103,7 @@ workflows:
- scala_job:
name: jdk11_dotty
java_version: jdk11
scala_version: 0.23.0-RC1
scala_version: 0.28.0-bin-20200904-1ab71c1-NIGHTLY
- scala_job:
name: jdk13_2.12
java_version: jdk13
Expand All @@ -115,7 +115,7 @@ workflows:
- scala_job:
name: jdk13_dotty
java_version: jdk13
scala_version: 0.23.0-RC1
scala_version: 0.28.0-bin-20200904-1ab71c1-NIGHTLY
- scala_job:
name: jdk14_2.12
java_version: jdk14
Expand All @@ -127,7 +127,7 @@ workflows:
- scala_job:
name: jdk14_dotty
java_version: jdk14
scala_version: 0.23.0-RC1
scala_version: 0.28.0-bin-20200904-1ab71c1-NIGHTLY
- scalajs_job:
name: sjs0.6_2.12
scala_version: 2.12.10
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
language: scala

scala:
- 0.23.0-RC1
- 0.28.0-bin-20200904-1ab71c1-NIGHTLY
- 2.12.10
- 2.13.1

Expand All @@ -18,9 +18,9 @@ env:

matrix:
exclude:
- scala: 0.23.0-RC1
- scala: 0.28.0-bin-20200904-1ab71c1-NIGHTLY
env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8
- scala: 0.23.0-RC1
- scala: 0.28.0-bin-20200904-1ab71c1-NIGHTLY
env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8

install:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.28.0-bin-20200904-1ab71c1-NIGHTLY",
// Scala.js cannot run forked tests
fork in Test := false
)
Expand Down
2 changes: 1 addition & 1 deletion jvm/src/test/scala/scala/xml/XMLTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
2 changes: 1 addition & 1 deletion shared/src/main/scala/scala/xml/parsing/MarkupParser.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down