Skip to content

support for Scala 2.13 #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2019
Merged

support for Scala 2.13 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
[<img src="https://img.shields.io/travis/scala/scala-swing/java7.svg"/>](https://travis-ci.org/scala/scala-swing)
[<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)
[<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)
[<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)

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).

Expand Down
16 changes: 10 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature")

// Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
scalaVersionsByJvm in ThisBuild := Map(
8 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> true),
9 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false),
10 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false),
11 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false),
12 -> List("2.11.12", "2.12.8", "2.13.0-RC3").map(_ -> false)
8 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> true),
9 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false),
10 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false),
11 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false),
12 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false)
)

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