Merge branch 'master' into release

Author: jpsacha

.gitignore

@@ -24,3 +24,4 @@ project/target
 .worksheet/
 *.sc
 .externalToolBuilders/
+/_local_/

.travis.yml

@@ -2,16 +2,17 @@ sudo: false
 
 language: scala
 scala:
-  - 2.12.9
-  - 2.13.0
+  - 2.12.10
+  - 2.13.1
 
 dist: xenial
 services:
   - xvfb
 
 jdk:
-- oraclejdk11
-- oraclejdk12
+  - oraclejdk11
+  - oraclejdk12
+  - oraclejdk13
 
 install: true
 

build.sbt

@@ -11,10 +11,11 @@ import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
 // JAR_BUILT_BY      - Name to be added to Jar metadata field "Built-By" (defaults to System.getProperty("user.name")
 //
 
-val projectVersion = "0.3.2"
-val versionTagDir  = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v." + projectVersion
-val _scalaVersions = Seq("2.13.0", "2.12.9")
-val _scalaVersion  = _scalaVersions.head
+val projectVersion  = "0.3.2.6-SNAPSHOT"
+val versionTagDir   = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v." + projectVersion
+val _scalaVersions  = Seq("2.13.1", "2.12.10")
+val _scalaVersion   = _scalaVersions.head
+val _scalaFXVersion = "12.0.2"
 
 version             := projectVersion
 crossScalaVersions  := _scalaVersions
@@ -31,8 +32,11 @@ lazy val OSName = System.getProperty("os.name") match {
 }
 
 lazy val JavaFXModuleNames = Seq("base", "controls", "fxml", "graphics", "media", "swing", "web")
+lazy val JavaFXModuleLibsProvided: Seq[ModuleID] =
+  JavaFXModuleNames.map(m => "org.openjfx" % s"javafx-$m" % _scalaFXVersion % "provided" classifier OSName)
 lazy val JavaFXModuleLibs: Seq[ModuleID] =
-  JavaFXModuleNames.map(m => "org.openjfx" % s"javafx-$m" % "12.0.2" % "provided" classifier OSName)
+  JavaFXModuleNames.map(m => "org.openjfx" % s"javafx-$m" % _scalaFXVersion classifier OSName)
+
 
 def isScala2_13plus(scalaVersion: String): Boolean = {
   CrossVersion.partialVersion(scalaVersion) match {
@@ -68,11 +72,12 @@ lazy val scalaFXExtrasDemos = (project in file("scalafx-extras-demos")).settings
     "-Djavafx.verbose"
   ),
   scalacOptions ++= Seq("-deprecation"),
+  libraryDependencies ++= JavaFXModuleLibs,
   publishArtifact := false,
   libraryDependencies ++= Seq(
     "com.typesafe.scala-logging" %% "scala-logging"   % "3.9.2",
     "ch.qos.logback"              % "logback-classic" % "1.2.3"
-  )
+  ),
 ).dependsOn(scalaFXExtras % "compile;test->test")
 
 // Resolvers
@@ -89,7 +94,7 @@ lazy val scalaFXExtrasSettings = Seq(
   scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8", "-feature"),
   scalacOptions in(Compile, doc) ++= Opts.doc.title("ScalaFX Extras API"),
   scalacOptions in(Compile, doc) ++= Opts.doc.version(projectVersion),
-  scalacOptions in(Compile, doc) += s"-doc-external-doc:${scalaInstance.value.libraryJar}#http://www.scala-lang.org/api/${scalaVersion.value}/",
+  scalacOptions in(Compile, doc) += s"-doc-external-doc:${scalaInstance.value.libraryJars.head}#http://www.scala-lang.org/api/${scalaVersion.value}/",
   scalacOptions in(Compile, doc) ++= Seq("-doc-footer", s"ScalaFX Extras API v.$projectVersion"),
   // If using Scala 2.13 or better, enable macro processing through compiler option
   scalacOptions += (if (isScala2_13plus(scalaVersion.value)) "-Ymacro-annotations" else ""),
@@ -106,12 +111,12 @@ lazy val scalaFXExtrasSettings = Seq(
     //    "-source", "1.8",
     "-Xlint:deprecation"),
   libraryDependencies ++= Seq(
-    "com.beachape"   %% "enumeratum"          % "1.5.13",
+    "com.beachape"   %% "enumeratum"          % "1.5.15",
     "org.scala-lang"  % "scala-reflect"       % scalaVersion.value,
     "org.scalafx"    %% "scalafx"             % "12.0.2-R18",
     "org.scalafx"    %% "scalafxml-core-sfx8" % "0.5",
-    "org.scalatest"  %% "scalatest"           % "3.0.8" % "test"
-  ) ++ JavaFXModuleLibs,
+    "org.scalatest"  %% "scalatest"           % "3.1.0" % "test"
+  ) ++ JavaFXModuleLibsProvided,
   // Use `pomPostProcess` to remove dependencies marked as "provided" from publishing in POM
   // This is to avoid dependency on wrong OS version JavaFX libraries
   // See also [https://stackoverflow.com/questions/27835740/sbt-exclude-certain-dependency-only-during-publish]

notes/0.3.3.md

@@ -0,0 +1,14 @@
+### ScalaFX-Extras Release v.0.3.3
+
+Bug fix release:
+
+* [Issue #7][7] BusyWorker: scala.MatchError
+
+
+To post questions please use [ScalaFX Users Group][scalafx-users] of [StackOverflow ScalaFX][scalafx-overflow]  
+
+[scalafx-users]: https://groups.google.com/forum/#!forum/scalafx-users
+[scalafx-overflow]: https://stackoverflow.com/questions/tagged/scalafx
+
+[7]: https://github.com/scalafx/scalafx-extras/issues/7
+

project/build.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011-2019, ScalaFX Project
+# Copyright (c) 2011-2020, ScalaFX Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,5 +24,5 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-sbt.version=1.3.0
+sbt.version=1.3.8
 

project/sbt-sonatype.sbt

@@ -1,3 +1,3 @@
 // [https://github.com/xerial/sbt-sonatype]
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.7")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")

scalafx-extras-demos/src/main/scala/org/scalafx/extras/mvcfx/stopwatch/StopWatchApp.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018, ScalaFX Project
+ * Copyright (c) 2011-2020, ScalaFX Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,9 +43,9 @@ import scala.language.implicitConversions
 object StopWatchApp extends JFXApp {
 
   stage = new PrimaryStage {
+    icons += new Image("/org/scalafx/extras/sfx.png")
+    title = "StopWatch"
     scene = new Scene {
-      icons += new Image("/org/scalafx/extras/sfx.png")
-      title = "StopWatch"
       root = new BorderPane {
         center = new StopWatch().view
       }

scalafx-extras/src/main/scala/org/scalafx/extras/BusyWorker.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2019, ScalaFX Project
+ * Copyright (c) 2011-2020, ScalaFX Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -460,6 +460,9 @@ class BusyWorker private(val title: String,
         case NonFatal(t) =>
           val message = s"Unexpected error while performing a UI task: '$name'. " // + Option(t.getMessage).getOrElse("")
           showException(title, message, t)
+        case t =>
+          // Propagate fatal errors
+          throw t
       }
       resetProgress()
     }

scalafx-extras/src/main/scala/org/scalafx/extras/image/ImageDisplay.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2019, ScalaFX Project
+ * Copyright (c) 2011-2020, ScalaFX Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

scalafx-extras/src/main/scala/org/scalafx/extras/pong/Pong.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2019, ScalaFX Project
+ * Copyright (c) 2011-2020, ScalaFX Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@ class Pong {
   private val startButtonVisible = BooleanProperty(true)
 
   private val keyFrame = KeyFrame(10 ms, onFinished = {
-    event: ActionEvent =>
+    _: ActionEvent =>
       checkForCollision()
       val horzPixels = if (ball.movingRight) 1 else -1
       val vertPixels = if (ball.movingDown) 1 else -1
@@ -71,7 +71,7 @@ class Pong {
     text = "Start!"
     visible <== startButtonVisible
     onAction = {
-      event: ActionEvent =>
+      _: ActionEvent =>
         startButtonVisible() = false
         pongAnimation.playFromStart()
         pongComponents.requestFocus()
@@ -138,7 +138,7 @@ class Pong {
     }
   }
 
-  private val timer = AnimationTimer { t =>
+  private val timer = AnimationTimer { _ =>
     val paddleSpeed = 3
 
     def updatePaddle(paddle: Paddle): Unit = {