Skip to content

Commit 86e4dc5

Browse files
authored
Merge pull request #110 from Sciss/work
support for Scala 2.13
2 parents b064b5d + a1b0c44 commit 86e4dc5

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[<img src="https://img.shields.io/travis/scala/scala-swing/java7.svg"/>](https://travis-ci.org/scala/scala-swing)
44
[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-swing_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-swing_2.11)
55
[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-swing_2.12.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-swing_2.12)
6+
[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-swing_2.13.svg?label=latest%20release%20for%202.13"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-swing_2.13)
67

78
This is now community maintained by [@Sciss](https://github.com/Sciss) and [@benhutchison](https://github.com/benhutchison). If you are interested in helping then contact them or [@adriaanm](https://github.com/adriaanm).
89

build.sbt

+10-6
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature")
1010

1111
// Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
1212
scalaVersionsByJvm in ThisBuild := Map(
13-
8 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> true),
14-
9 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false),
15-
10 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false),
16-
11 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false),
17-
12 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false)
13+
8 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> true),
14+
9 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false),
15+
10 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false),
16+
11 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false),
17+
12 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false)
1818
)
1919

2020
scalaVersion in ThisBuild := "2.12.8"
@@ -29,7 +29,11 @@ shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project
2929
lazy val swing = project.in(file("."))
3030
.settings(
3131
libraryDependencies += {
32-
"org.scalatest" %% "scalatest" % "3.0.8-RC5" % Test
32+
if (scalaVersion.value == "2.13.0") {
33+
"org.scalatest" % "scalatest_2.13.0-RC3" % "3.0.8-RC5" % Test
34+
} else {
35+
"org.scalatest" %% "scalatest" % "3.0.8-RC5" % Test
36+
}
3337
},
3438
// Adds a `src/main/scala-2.13+` source directory for Scala 2.13 and newer
3539
// and a `src/main/scala-2.13-` source directory for Scala version older than 2.13

0 commit comments

Comments
 (0)