Skip to content

Commit d1adfff

Browse files
committed
Scala 3.0.0-RC2, sbt 1.5
1 parent 6e2264f commit d1adfff

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

.travis.yml

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

77
scala:
8+
- 3.0.0-RC2
89
- 3.0.0-RC1
910
- 2.11.12
1011
- 2.12.13

build.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
4141
)
4242
case _ => Seq()
4343
}),
44-
Compile / doc / scalacOptions ++= {
45-
if (isDotty.value)
44+
Compile / doc / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
45+
case Some((3, _)) =>
4646
Seq() // TODO see what flags might be desirable to pass to Scala 3's Scaladoc
47-
else
47+
case _ =>
4848
Seq(
4949
"-diagrams",
5050
"-doc-source-url",
@@ -56,7 +56,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
5656
"-doc-version",
5757
version.value
5858
)
59-
},
59+
}),
6060
Compile / unmanagedSourceDirectories ++= {
6161
(Compile / unmanagedSourceDirectories).value.map { dir =>
6262
CrossVersion.partialVersion(scalaVersion.value) match {

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.9
1+
sbt.version=1.5.0-RC2

project/plugins.sbt

-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1111

1212
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
1313
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
14-
15-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")

0 commit comments

Comments
 (0)