diff --git a/.travis.yml b/.travis.yml index c93f02b..22657c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ scala: - 2.11.12 - 2.12.11 - 2.13.3 - - 3.0.0-RC2 + - 3.0.0 env: - ADOPTOPENJDK=8 diff --git a/build.sbt b/build.sbt index bb62d8c..6eb9e06 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -lazy val scalaTestVersion = "3.2.7" +lazy val scalaTestVersion = "3.2.9" // We use .. like 99% of Scala libraries. // Versions are binary compatible within x.y.* but not within x.*.* @@ -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. @@ -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")) diff --git a/project/build.properties b/project/build.properties index dbae93b..19479ba 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.9 +sbt.version=1.5.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index d4b33e3..49639f2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")