Skip to content

Commit ae7c327

Browse files
authored
Merge pull request #352 from ashawley/dotty-0.18.1-RC1
Update dotty 0.18.1-RC1
2 parents d19b7f6 + 7ee7852 commit ae7c327

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ workflows:
8585
- scala_job:
8686
name: dotty
8787
java_version: jdk8
88-
scala_version: 0.17.0-RC1
88+
scala_version: 0.18.1-RC1
8989
- scala_job:
9090
name: jdk11_2.12.9
9191
java_version: jdk11
@@ -97,7 +97,7 @@ workflows:
9797
- scala_job:
9898
name: jdk11_dotty
9999
java_version: jdk11
100-
scala_version: 0.17.0-RC1
100+
scala_version: 0.18.1-RC1
101101
- scalajs_job:
102102
name: sjs0.6_2.12
103103
scala_version: 2.12.9

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: scala
33
scala:
44
- 2.12.9
55
- 2.13.0
6-
- 0.17.0-RC1
6+
- 0.18.1-RC1
77

88
env:
99
global:
@@ -22,9 +22,9 @@ env:
2222

2323
matrix:
2424
exclude:
25-
- scala: 0.17.0-RC1
25+
- scala: 0.18.1-RC1
2626
env: SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=8
27-
- scala: 0.17.0-RC1
27+
- scala: 0.18.1-RC1
2828
env: SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
2929

3030
before_install:

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ lazy val configSettings: Seq[Setting[_]] = Seq(
1111
Seq(
1212
CrossVersion.partialVersion(sv) match {
1313
case Some((2, 13)) => file(dir.getPath ++ "-2.13+")
14+
case Some((0, _)) => file(dir.getPath ++ "-2.13+")
1415
case _ => file(dir.getPath ++ "-2.13-")
1516
},
1617
CrossVersion.partialVersion(sv) match {
@@ -30,7 +31,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
3031
.settings(scalaModuleSettings)
3132
.jvmSettings(scalaModuleSettingsJVM)
3233
.jvmSettings(
33-
crossScalaVersions += "0.17.0-RC1"
34+
crossScalaVersions += "0.18.1-RC1"
3435
)
3536
.settings(
3637
name := "scala-xml",

shared/src/main/scala/scala/xml/dtd/impl/Base.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private[dtd] abstract class Base {
2020
type _regexpT <: RegExp
2121

2222
abstract class RegExp {
23-
val isNullable: Boolean
23+
def isNullable: Boolean
2424
}
2525

2626
object Alt {

0 commit comments

Comments
 (0)