Skip to content

Commit

Permalink
Update scala to 3.0.0-RC1 (#357)
Browse files Browse the repository at this point in the history
  • Loading branch information
Philippus authored Feb 17, 2021
1 parent d6dad72 commit a81711a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .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:
- 3.0.0-M3
- 3.0.0-RC1
- 2.11.12
- 2.12.13
- 2.13.4
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
// so we can `@nowarn` in test code, but only in test code, so the dependency
// doesn't leak downstream
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.1" % Test,
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2" % Test,

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

0 comments on commit a81711a

Please sign in to comment.