Skip to content

Commit 111306f

Browse files
committed
update to include Scala 3.0.0
- bump scala-test - drop sbt-dotty plugin, update sbt-scala-module plugin
1 parent b1ac806 commit 111306f

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ scala:
88
- 2.11.12
99
- 2.12.11
1010
- 2.13.3
11-
- 3.0.0-RC2
11+
- 3.0.0
1212

1313
env:
1414
- ADOPTOPENJDK=8

build.sbt

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
lazy val scalaTestVersion = "3.2.7"
1+
lazy val scalaTestVersion = "3.2.9"
22

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

4142
lazy val examples = project.in(file("examples"))

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.9
1+
sbt.version=1.5.2

project/plugins.sbt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4")
2-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4") // cross-compile for dotty
3-
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.0")
2+
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.1")

0 commit comments

Comments
 (0)