Merge branch 'master' into release

Author: jpsacha

.gitattributes

@@ -1,2 +1,3 @@
 # Set the default line separator behavior, in case people don't have core.autocrlf set.
-* text=auto
+# [[https://stackoverflow.com/a/42135910]]
+* text=auto eol=lf

ReadMe.md

@@ -2,8 +2,8 @@ ScalaFX Extras
 ==============
 
 [![Build Status](https://travis-ci.org/scalafx/scalafx-extras.svg?branch=master)](https://travis-ci.org/scalafx/scalafx-extras)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.scalafx/scalafx-extras_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.scalafx/scalafx-extras_2.12)
-[![Scaladoc](http://javadoc-badge.appspot.com/org.scalafx/scalafx-extras_2.12.svg?label=scaladoc)](http://javadoc-badge.appspot.com/org.scalafx/scalafx-extras_2.12)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.scalafx/scalafx-extras_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.scalafx/scalafx-extras_2.13)
+[![Scaladoc](http://javadoc-badge.appspot.com/org.scalafx/scalafx-extras_2.13.svg?label=scaladoc)](http://javadoc-badge.appspot.com/org.scalafx/scalafx-extras_2.13)
 
 ScalaFX Extras are additions to ScalaFX that simplify creation of User interfaces. 
 In contrast to ScalaFX core, the Extras do not have direct corresponding concepts in JavaFX. 

build.sbt

@@ -11,9 +11,9 @@ 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.3"
+val projectVersion  = "0.3.3.1-SNAPSHOT"
 val versionTagDir   = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v." + projectVersion
-val _scalaVersions  = Seq("2.13.1", "2.12.10")
+val _scalaVersions  = Seq("2.13.1", "2.12.11")
 val _scalaVersion   = _scalaVersions.head
 val _scalaFXVersion = "12.0.2"
 
@@ -115,7 +115,7 @@ lazy val scalaFXExtrasSettings = Seq(
     "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.1.0" % "test"
+    "org.scalatest"  %% "scalatest"           % "3.1.1" % "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

project/build.properties

@@ -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.8
+sbt.version=1.3.10
 

project/sbt-sonatype.sbt

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

scalafx-extras/src/main/scala/org/scalafx/extras/mvcfx/MVCfx.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
@@ -67,8 +67,12 @@ abstract class MVCfx(fxmlFilePath: String) {
   def model: ModelFX
 
   /** Top level UI node for this component. */
-  val view: Parent = createFXMLView()
-  model.parent.value = view
+  lazy val view: Parent = {
+    val _view = createFXMLView()
+    // Delay assigment till `view` is accessed first time
+    model.parent.value = _view
+    _view
+  }
 
   /** Create a stage containing this component. The model is initialized on a separate thread. */
   def createStage(title: String): Stage = {