Skip to content

Commit e3f626c

Browse files
authored
Merge pull request #308 from scala-steward/update/sbt-1.4.2
Update sbt to 1.4.2
2 parents 338ba0b + 46ebf43 commit e3f626c

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

build.sbt

+13-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
1111
name := "scala-parser-combinators",
1212
scalaModuleMimaPreviousVersion := None, // until we publish 1.2.0
1313

14+
libraryDependencies += "junit" % "junit" % "4.13.1" % Test,
15+
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
16+
1417
apiMappings ++= scalaInstance.value.libraryJars.collect {
1518
case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") =>
1619
file -> url(s"http://www.scala-lang.org/api/${scalaVersion.value}/")
@@ -35,9 +38,12 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
3538
)
3639
case _ => Seq()
3740
}),
41+
// don't run Dottydoc, it errors and isn't needed anyway
42+
Compile / doc / sources := (if (isDotty.value) Seq() else (Compile / doc/ sources).value),
43+
Compile / packageDoc / publishArtifact := !isDotty.value,
3844
Compile / doc / scalacOptions ++= {
3945
if (isDotty.value)
40-
Seq("-language:Scala2")
46+
Seq()
4147
else
4248
Seq(
4349
"-diagrams",
@@ -64,11 +70,15 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
6470
.jvmSettings(
6571
ScalaModulePlugin.scalaModuleOsgiSettings,
6672
OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}"),
67-
libraryDependencies += "junit" % "junit" % "4.13.1" % Test,
68-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
6973
)
7074
.jsSettings(
7175
crossScalaVersions -= "0.27.0-RC1",
76+
// mystified why https://github.com/scala-js/scala-js/issues/635 would be rearing its head,
77+
// but only on sbt 1.4 + 2.13 and only in Test config?! WEIRD
78+
Test / doc / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
79+
case Some((2, 13)) => Seq("-Wconf:msg=dropping dependency on node with no phase object*:i")
80+
case _ => Seq()
81+
}),
7282
// Scala.js cannot run forked tests
7383
Test / fork := false
7484
)

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.13
1+
sbt.version=1.4.2

0 commit comments

Comments
 (0)