Skip to content

Commit 6950d8f

Browse files
committed
add Scala 3.0.0-RC2 to crossbuild
1 parent 0186822 commit 6950d8f

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
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

+12-12
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ lazy val scalaJava8Compat = (project in file("."))
7272

7373
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
7474

75-
scalaModuleMimaPreviousVersion := {
75+
scalaModuleMimaPreviousVersion := (CrossVersion.partialVersion(scalaVersion.value) match {
7676
// pending resolution of https://github.com/scalacenter/sbt-version-policy/issues/62
77-
if (isDotty.value) None
78-
else Some("0.9.1")
79-
},
77+
case Some((3, _)) => None
78+
case _ => Some("0.9.1")
79+
}),
8080

8181
mimaBinaryIssueFilters ++= {
8282
import com.typesafe.tools.mima.core._, ProblemFilters._
@@ -146,14 +146,14 @@ lazy val scalaJava8Compat = (project in file("."))
146146
},
147147
JavaDoc / javacOptions := Seq("-Xdoclint:none"),
148148
JavaDoc / packageDoc / artifactName := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"),
149-
libraryDependencies ++= (
150-
if (isDotty.value) Seq()
151-
else Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.16" cross CrossVersion.full))
152-
),
153-
Compile / scalacOptions ++= (
154-
if (isDotty.value) Seq()
155-
else Seq(s"""-P:genjavadoc:out=${target.value / "java"}""")
156-
),
149+
libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
150+
case Some((3, _)) => Seq()
151+
case _ => Seq(compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.16" cross CrossVersion.full))
152+
}),
153+
Compile / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
154+
case Some((3, _)) => Seq()
155+
case _ => Seq(s"""-P:genjavadoc:out=${target.value / "java"}""")
156+
}),
157157
)
158158
}
159159
)

0 commit comments

Comments
 (0)