Merge branch 'master' into stable

Author: jpsacha

.travis.yml

@@ -2,28 +2,20 @@ sudo: false
 
 language: scala
 scala:
-#- 2.11.12
-- 2.12.7
+  - 2.12.9
+  - 2.13.0
 
-before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+dist: xenial
+services:
+  - xvfb
 
 jdk:
 - oraclejdk11
-  
+- oraclejdk12
+
 install: true
 
 script:
   - java -version
   - sbt test
 
-branches:
-  only:
-    - master
-    - stable
-
-notifications:
-  email:
-    - [email protected]
-

ReadMe.md

@@ -100,16 +100,18 @@ The demos module has a complete example of an simple application in `ShowMessage
 
 ### BusyWorker
 
-BusyWorker helps running UI tasks a separate threads (other than the JavaFX Application thread). 
-It will show busy cursor and disable specified nodes while task is performed.
+BusyWorker helps running a UI task on separate threads (other than the JavaFX Application thread). 
+It will show busy cursor and disable specified nodes while the task is performed.
 It gives an option to show progress and status messages. 
-`BusyWorker` run tasks and takes care of handling handling exceptions and displaying error dialogs.
-There is also option to perform custom finish actions after task is completed.
+`BusyWorker` takes care of handling handling exceptions and displaying error dialogs.
+It provides for an option to perform custom finish actions after task is completed.
 
-A simple case of using `BusyWorker`. 
-When the task is running, it will disable the root pane of the `parentWindow` to indicate that a task is performed.
-It will also change the cursor in the root pane to busy. 
-When task is done, the cursor will be changed back to default and root pane will enabled back.
+#### Example 1
+
+Below is a simple example of using `BusyWorker`. 
+When the task is running, `BusyWorker` will disable the root pane of the `parentWindow` to indicate that a task is performed.
+It will also change the cursor in the root pane to "busy". 
+When task is done, the cursor will be changed back to default and root pane will be enabled back.
 
 ```scala
 new BusyWorker("Simple Task", parentWindow).doTask { () =>
@@ -118,8 +120,9 @@ new BusyWorker("Simple Task", parentWindow).doTask { () =>
 }
 ```
 
-A little bit more elaborated example that updates a progress message and progress indicator.
-The full example can be found in the `BusyWorkerDemo`.
+#### Examnple 2
+
+Her is a little bit more elaborated example. It updates a progress message and progress indicator.
 ```scala
   val buttonPane: Pane = ...
   val progressLabel: Label = ...
@@ -148,14 +151,15 @@ The full example can be found in the `BusyWorkerDemo`.
         )
   }
 ```
-
+The full code example can be found in the 
+[BusyWorkerDemo][BusyWorkerDemo].
 
 
 ### Simpler Use of FXML with MVCfx Pattern
 
 Package `org.scalafx.extras.mvcfx` contains classes for creating with UI components based on FXML.
 
-The demos module has a complete example of a simple application: `StopWatchApp`.
+The demos module has a complete example of a simple application: [StopWatchApp][StopWatchDemo].
 
 ### ImageDisplay Component
 
@@ -166,23 +170,33 @@ It can also automatically resizes to parent size.
 Demos
 -----
 
-Module `scalafx-extras-demos` contains examples of using ScalaFX Extras.
+Module [scalafx-extras-demos][scalafx-extras-demos] contains examples of using ScalaFX Extras.
 
 ### StopWatch Application
 
-`StopWatchApp` is an application that illustrates uses of the MVCfx: a Model-Controller and SFXML/FXML API.
+[StopWatchApp][StopWatchDemo] is an application that illustrates uses of the MVCfx: a Model-Controller and SFXML/FXML API.
+
+![StopWatch Demo](notes/assets/StopWatchDemo.gif)
 
 ### ShowMessage Demo
-`ShowMessageDemoApp` is a full example of using `ShowMessage` and MVCfx.
+
+[ShowMessageDemoApp][ShowMessageDemo] is a full example of using `ShowMessage` and MVCfx.
+
+![ShowMessage Demo](notes/assets/ShowMessageDemo.gif)
 
 ### BusyWorker Demo
-`BusyWorkerDemo` illustrated different aspects of using `BusyWorker`.
+
+[BusyWorkerDemo][BusyWorkerDemo] illustrated different aspects of using `BusyWorker`.
+
+![BusyWorker Demo](notes/assets/BusyWorkerDemo.gif)
 
 ### ImageDisplay Demo
 
-`ImageDisplayDemoApp` a simple example of an application that can display images, 
+[ImageDisplayDemoApp][ImageDisplayDemo] a simple example of an application that can display images, 
 with ability to zoom in, zoom out, and fit to current window. Illustrates use of the `ImageDisplay` component.
 
+![Image Display Demo](notes/assets/ImageDisplayDemo.gif)
+
 Status
 ------
 
@@ -200,3 +214,9 @@ License
 -------
 
 BSD-3-Clause ScalaFX license.
+
+[scalafx-extras-demos]: scalafx-extras-demos
+[BusyWorkerDemo]: scalafx-extras-demos/src/main/scala/org/scalafx/extras/BusyWorkerDemo.scala
+[ImageDisplayDemo]: scalafx-extras-demos\src\main\scala\org\scalafx\extras\image\ImageDisplayDemoApp.scala
+[ShowMessageDemo]: scalafx-extras-demos\src\main\scala\org\scalafx\extras\showmessage
+[StopWatchDemo]: scalafx-extras-demos\src\main\scala\org\scalafx\extras\mvcfx\stopwatch

build.sbt

@@ -1,5 +1,8 @@
 import java.net.URL
 
+import scala.xml.transform.{RewriteRule, RuleTransformer}
+import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
+
 // @formatter:off
 
 //
@@ -8,9 +11,9 @@ import java.net.URL
 // JAR_BUILT_BY      - Name to be added to Jar metadata field "Built-By" (defaults to System.getProperty("user.name")
 //
 
-val projectVersion = "0.3.0"
+val projectVersion = "0.3.1-SNAPSHOT"
 val versionTagDir  = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v" + projectVersion
-val _scalaVersions = Seq("2.12.7")
+val _scalaVersions = Seq("2.13.0", "2.12.9")
 val _scalaVersion = _scalaVersions.head
 
 crossScalaVersions := _scalaVersions
@@ -24,8 +27,15 @@ lazy val OSName = System.getProperty("os.name") match {
 }
 
 lazy val JavaFXModuleNames = Seq("base", "controls", "fxml", "graphics", "media", "swing", "web")
-lazy val JavaFXModuleLibs: Seq[ModuleID] = 
-  JavaFXModuleNames.map(m => "org.openjfx" % s"javafx-$m" % "11" classifier OSName)
+lazy val JavaFXModuleLibs: Seq[ModuleID] =
+  JavaFXModuleNames.map(m => "org.openjfx" % s"javafx-$m" % "12.0.2" classifier OSName)
+
+def isScala2_13plus(scalaVersion: String): Boolean = {
+  CrossVersion.partialVersion(scalaVersion) match {
+    case Some((2, n)) if n >= 13 => true
+    case _ => false
+  }
+}
 
 // ScalaFX Extras project
 lazy val scalaFXExtras = (project in file("scalafx-extras")).settings(
@@ -39,7 +49,7 @@ lazy val scalaFXExtras = (project in file("scalafx-extras")).settings(
   ) ++ (Option(System.getenv("GRAPHVIZ_DOT_PATH")) match {
     case Some(path) => Seq("-diagrams", "-diagrams-dot-path", path)
     case None => Seq.empty[String]
-  }) ++ (if (_scalaVersion.startsWith("2.11")) Seq("-Xexperimental") else Seq.empty[String])
+  })
 )
 
 // ScalaFX Extras Demos project
@@ -51,10 +61,10 @@ lazy val scalaFXExtrasDemos = (project in file("scalafx-extras-demos")).settings
     "-Xmx512M",
     "-Djavafx.verbose"
   ),
-  addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full),
+  scalacOptions ++= Seq("-deprecation"),
   publishArtifact := false,
   libraryDependencies ++= Seq(
-    "com.typesafe.scala-logging" %% "scala-logging"   % "3.9.0",
+    "com.typesafe.scala-logging" %% "scala-logging"   % "3.9.2",
     "ch.qos.logback"              % "logback-classic" % "1.2.3"
   )
 ).dependsOn(scalaFXExtras % "compile;test->test")
@@ -76,20 +86,45 @@ lazy val scalaFXExtrasSettings = Seq(
   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) ++= 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 ""),
+  // If using Scala 2.12 or lower, enable macro processing through compiler plugin
+  libraryDependencies ++= (
+    if (!isScala2_13plus(scalaVersion.value))
+      Seq(compilerPlugin(
+        "org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full))
+    else
+      Seq.empty[sbt.ModuleID]
+    ),
   javacOptions ++= Seq(
     //    "-target", "1.8",
     //    "-source", "1.8",
     "-Xlint:deprecation"),
   libraryDependencies ++= Seq(
     "com.beachape"   %% "enumeratum"          % "1.5.13",
     "org.scala-lang"  % "scala-reflect"       % scalaVersion.value,
-    "org.scalafx"    %% "scalafx"             % "11-R16",
-    "org.scalafx"    %% "scalafxml-core-sfx8" % "0.4",
-    "org.scalatest"  %% "scalatest"           % "3.0.5" % "test"
+    "org.scalafx"    %% "scalafx"             % "12.0.2-R18",
+    "org.scalafx"    %% "scalafxml-core-sfx8" % "0.5",
+    "org.scalatest"  %% "scalatest"           % "3.0.8" % "test"
   ) ++ JavaFXModuleLibs,
+  // 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]
+  pomPostProcess := { node: XmlNode =>
+    new RuleTransformer(new RewriteRule {
+      override def transform(node: XmlNode): XmlNodeSeq = node match {
+        case e: Elem if e.label == "dependency" && e.child.exists(c => c.label == "scope" && c.text == "provided") =>
+          val organization = e.child.filter(_.label == "groupId").flatMap(_.text).mkString
+          val artifact = e.child.filter(_.label == "artifactId").flatMap(_.text).mkString
+          val version = e.child.filter(_.label == "version").flatMap(_.text).mkString
+          Comment(s"provided dependency $organization#$artifact;$version has been omitted")
+        case _ => node
+      }
+    }).transform(node).head
+  },
   autoAPIMappings := true,
   manifestSetting,
-  publishSetting,
+  publishTo := sonatypePublishToBundle.value,
   fork in run := true,
   fork in Test := true,
   parallelExecution in Test := false,
@@ -117,14 +152,6 @@ lazy val manifestSetting = packageOptions += {
   )
 }
 
-lazy val publishSetting = publishTo := {
-  val nexus = "https://oss.sonatype.org/"
-  if (isSnapshot.value)
-    Some("snapshots" at nexus + "content/repositories/snapshots")
-  else
-    Some("releases"  at nexus + "service/local/staging/deploy/maven2")
-}
-
 // Metadata needed by Maven Central
 // See also http://maven.apache.org/pom.html#Developers
 lazy val mavenCentralSettings = Seq(

notes/0.3.1.md

@@ -0,0 +1,18 @@
+### ScalaFX-Extras Release v.0.3.1
+
+Main objective of this release is to add support for Scala 2.13
+
+Changes:
+
+* [Issue #3][3] Do not catch Throwable
+* [Issue #4][4] Do not catch Throwable
+
+
+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
+
+[3]: https://github.com/scalafx/scalafx-extras/issues/3
+[4]: https://github.com/scalafx/scalafx-extras/issues/4
+

notes/assets/BusyWorkerDemo.gif

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011-2018, ScalaFX Project
+# Copyright (c) 2011-2019, 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.2.6
+sbt.version=1.3.0
 

notes/assets/ImageDisplayDemo.gif

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