Skip to content

Commit a81711a

Browse files
authored
Update scala to 3.0.0-RC1 (#357)
1 parent d6dad72 commit a81711a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.travis.yml

+1-1
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-
- 3.0.0-M3
8+
- 3.0.0-RC1
99
- 2.11.12
1010
- 2.12.13
1111
- 2.13.4

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
1515
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
1616
// so we can `@nowarn` in test code, but only in test code, so the dependency
1717
// doesn't leak downstream
18-
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.1" % Test,
18+
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2" % Test,
1919

2020
apiMappings ++= scalaInstance.value.libraryJars.collect {
2121
case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") =>
@@ -43,7 +43,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
4343
}),
4444
Compile / doc / scalacOptions ++= {
4545
if (isDotty.value)
46-
Seq() // TODO see what flags might be desirable to pass to Scala3doc
46+
Seq() // TODO see what flags might be desirable to pass to Scala 3's Scaladoc
4747
else
4848
Seq(
4949
"-diagrams",

0 commit comments

Comments
 (0)