Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ scala:
- 2.11.12
- 2.12.11
- 2.13.3
- 3.0.0-RC2
- 3.0.0

env:
- ADOPTOPENJDK=8
Expand Down
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lazy val scalaTestVersion = "3.2.7"
lazy val scalaTestVersion = "3.2.9"

// We use <epoch>.<major>.<minor> like 99% of Scala libraries.
// Versions are binary compatible within x.y.* but not within x.*.*
Expand All @@ -15,6 +15,7 @@ lazy val swing = project.in(file("."))
.settings(commonSettings)
.settings(
name := "scala-swing",
scalaModuleAutomaticModuleName := Some("scala.swing"),
OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}"),
// scalaModuleMimaPreviousVersion := Some("2.1.0"), TODO re-enable after we have a 3.0 release
// set the prompt (for this build) to include the project id.
Expand All @@ -33,9 +34,9 @@ lazy val swing = project.in(file("."))
case _ => sourceDir / "scala-2.13-"
}
},
sources in (Compile, doc) := {
if (isDotty.value) Nil else (sources in (Compile, doc)).value // dottydoc is currently broken
},
// sources in (Compile, doc) := {
// if (isDotty.value) Nil else (sources in (Compile, doc)).value // dottydoc is currently broken
// },
)

lazy val examples = project.in(file("examples"))
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.9
sbt.version=1.5.2
5 changes: 2 additions & 3 deletions project/plugins.sbt
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.lamp" % "sbt-dotty" % "0.5.4") // cross-compile for dotty
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.0")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.1")