Skip to content

Scala 3.0.0-RC2, sbt 1.5 #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 29, 2021
Merged

Scala 3.0.0-RC2, sbt 1.5 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0186822
upgrade to sbt 1.5 (was 1.4)
SethTisue Mar 29, 2021
6950d8f
add Scala 3.0.0-RC2 to crossbuild
SethTisue Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down Expand Up @@ -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"}""")
}),
)
}
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.9
sbt.version=1.5.0-RC2
1 change: 0 additions & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")