From a1b0c4403138472a9524260ac0c8c098df338b40 Mon Sep 17 00:00:00 2001 From: Hanns Holger Rutz Date: Sat, 8 Jun 2019 21:47:31 +0200 Subject: [PATCH] support for Scala 2.13 --- README.md | 1 + build.sbt | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 57a63c31..37d52e4e 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [](https://travis-ci.org/scala/scala-swing) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-swing_2.11) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-swing_2.12) +[](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). diff --git a/build.sbt b/build.sbt index 52b01b09..544c8511 100644 --- a/build.sbt +++ b/build.sbt @@ -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" @@ -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