Scala 3.0.0-RC2, sbt 1.5

SethTisue · SethTisue · commit 3c31b61971fe · 2021-03-29T16:05:44.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
+  - 3.0.0-RC2
   - 3.0.0-RC1
   - 2.11.12
   - 2.12.13
diff --git a/build.sbt b/build.sbt
@@ -21,7 +21,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.2" % Test,
+    libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.3" % Test,
 
     apiMappings ++= scalaInstance.value.libraryJars.collect {
       case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") =>
@@ -47,10 +47,10 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
       )
       case _ => Seq()
     }),
-    Compile / doc / scalacOptions ++= {
-      if (isDotty.value)
+    Compile / doc / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((3, _)) =>
         Seq()  // TODO see what flags might be desirable to pass to Scala 3's Scaladoc
-      else
+      case _ =>
         Seq(
           "-diagrams",
           "-doc-source-url",
@@ -62,7 +62,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
           "-doc-version",
           version.value
         )
-    },
+    }),
     Compile / unmanagedSourceDirectories ++= {
       (Compile / unmanagedSourceDirectories).value.map { dir =>
         CrossVersion.partialVersion(scalaVersion.value) match {
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.9
+sbt.version=1.5.0-RC2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -11,6 +11,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
-
 addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=1.4.9`
	`1`	`+sbt.version=1.5.0-RC2`