Skip to content

Update sbt to 1.4.2 #308

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 3 commits into from
Nov 4, 2020
Merged

Update sbt to 1.4.2 #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80bfc2e
Update sbt to 1.4.2
scala-steward Nov 2, 2020
04e8767
disable dottydoc, for now anyway
SethTisue Nov 4, 2020
46ebf43
work around weird Scala.js Scaladoc thing, shrug
SethTisue Nov 4, 2020
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
16 changes: 13 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
name := "scala-parser-combinators",
scalaModuleMimaPreviousVersion := None, // until we publish 1.2.0

libraryDependencies += "junit" % "junit" % "4.13.1" % Test,
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,

apiMappings ++= scalaInstance.value.libraryJars.collect {
case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") =>
file -> url(s"http://www.scala-lang.org/api/${scalaVersion.value}/")
Expand All @@ -35,9 +38,12 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
)
case _ => Seq()
}),
// don't run Dottydoc, it errors and isn't needed anyway
Compile / doc / sources := (if (isDotty.value) Seq() else (Compile / doc/ sources).value),
Compile / packageDoc / publishArtifact := !isDotty.value,
Compile / doc / scalacOptions ++= {
if (isDotty.value)
Seq("-language:Scala2")
Seq()
else
Seq(
"-diagrams",
Expand All @@ -64,11 +70,15 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
.jvmSettings(
ScalaModulePlugin.scalaModuleOsgiSettings,
OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}"),
libraryDependencies += "junit" % "junit" % "4.13.1" % Test,
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
)
.jsSettings(
crossScalaVersions -= "0.27.0-RC1",
// mystified why https://github.com/scala-js/scala-js/issues/635 would be rearing its head,
// but only on sbt 1.4 + 2.13 and only in Test config?! WEIRD
Test / doc / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 13)) => Seq("-Wconf:msg=dropping dependency on node with no phase object*:i")
case _ => Seq()
}),
// Scala.js cannot run forked tests
Test / fork := false
)
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.3.13
sbt.version=1.4.2