Merge pull request #216 from SethTisue/scala-3.0.0-RC2

scala · Mar 29, 2021 · 0242c31 · 0242c31
2 parents 72e8efc + 6950d8f
commit 0242c31
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
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
@@ -72,11 +72,11 @@ lazy val scalaJava8Compat = (project in file("."))
 
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
 
-    scalaModuleMimaPreviousVersion := {
+    scalaModuleMimaPreviousVersion := (CrossVersion.partialVersion(scalaVersion.value) match {
       // pending resolution of https://github.com/scalacenter/sbt-version-policy/issues/62
-      if (isDotty.value) None
-      else Some("0.9.1")
-    },
+      case Some((3, _)) => None
+      case _            => Some("0.9.1")
+    }),
 
     mimaBinaryIssueFilters ++= {
       import com.typesafe.tools.mima.core._, ProblemFilters._
@@ -146,14 +146,14 @@ lazy val scalaJava8Compat = (project in file("."))
         },
         JavaDoc / javacOptions := Seq("-Xdoclint:none"),
         JavaDoc / packageDoc / artifactName := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"),
-        libraryDependencies ++= (
-          if (isDotty.value) Seq()
-          else Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.16" cross CrossVersion.full))
-        ),
-        Compile / scalacOptions ++= (
-          if (isDotty.value) Seq()
-          else Seq(s"""-P:genjavadoc:out=${target.value / "java"}""")
-        ),
+        libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
+          case Some((3, _)) => Seq()
+          case _            => Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.16" cross CrossVersion.full))
+        }),
+        Compile / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
+          case Some((3, _)) => Seq()
+          case _            => Seq(s"""-P:genjavadoc:out=${target.value / "java"}""")
+        }),
       )
     }
   )

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
@@ -1,3 +1,2 @@
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4")
 addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")