Merge pull request openjfx#36 from abhinayagarwal/master

Update to JavaFX 13

CommandLine/Modular/CLI/README.md

@@ -1,9 +1,9 @@
 # samples
 
-JavaFX 12 samples to run with different options and build tools.
+JavaFX 13 samples to run with different options and build tools.
 
-Download an appropriate [JDK 12](https://jdk.java.net/12/) for your operating system. Make sure `JAVA_HOME` 
-is properly set to the Java 12 installation directory. 
+Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
+Make sure `JAVA_HOME` is properly set to the JDK installation directory. 
 
 Download [JavaFX SDK](https://gluonhq.com/products/javafx/) for your operating 
 system and unzip to a desired location.
@@ -20,8 +20,8 @@ system and unzip to a desired location.
 If you run on Linux or Mac, follow these steps:
 
     cd CommandLine/Modular/CLI/hellofx
-    export PATH_TO_FX=path/to/javafx-sdk-12/lib
-    export PATH_TO_FX_MODS=path/to/javafx-jmods-12
+    export PATH_TO_FX=path/to/javafx-sdk-13/lib
+    export PATH_TO_FX_MODS=path/to/javafx-jmods-13
     javac --module-path $PATH_TO_FX -d mods/hellofx $(find src -name "*.java")
 
 To run the project:
@@ -38,8 +38,8 @@ To create and run a custom JRE:
 If you run on Windows, follow these steps:
 
     cd CommandLine\Modular\CLI\hellofx
-    set PATH_TO_FX="path\to\javafx-sdk-12\lib"
-    set PATH_TO_FX_MODS="path\to\javafx-jmods-12"
+    set PATH_TO_FX="path\to\javafx-sdk-13\lib"
+    set PATH_TO_FX_MODS="path\to\javafx-jmods-13"
     dir /s /b src\*.java > sources.txt & javac --module-path %PATH_TO_FX% -d mods/hellofx @sources.txt & del sources.txt
 
 To run the project:

CommandLine/Modular/Gradle/README.md

@@ -1,9 +1,9 @@
 # samples
 
-JavaFX 12 samples to run with different options and build tools.
+JavaFX 13 samples to run with different options and build tools.
 
-Download an appropriate [JDK 12](https://jdk.java.net/12/) for your operating system. Make sure `JAVA_HOME` 
-is properly set to the Java 12 installation directory. 
+Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
+Make sure `JAVA_HOME` is properly set to the JDK installation directory. 
 
 ## Modular - Gradle
 

CommandLine/Modular/Gradle/hellofx/build.gradle

@@ -9,7 +9,7 @@ repositories {
 }
 
 javafx {
-    version = "12.0.2"
+    version = "13"
     modules = [ 'javafx.controls' ]
 }
 

CommandLine/Modular/Maven/README.md

@@ -1,9 +1,9 @@
 # samples
 
-JavaFX 12 samples to run with different options and build tools.
+JavaFX 13 samples to run with different options and build tools.
 
-Download an appropriate [JDK 12](https://jdk.java.net/12/) for your operating system. Make sure `JAVA_HOME` 
-is properly set to the Java 12 installation directory. 
+Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
+Make sure `JAVA_HOME` is properly set to the JDK installation directory. 
 
 ## Modular - Maven
 

CommandLine/Modular/Maven/hellofx/pom.xml

@@ -11,6 +11,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.release>11</maven.compiler.release>
+        <javafx.version>13</javafx.version>
     </properties>
 
     <organization>
@@ -22,12 +24,12 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>12.0.2</version>
+            <version>${javafx.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>12.0.2</version>
+            <version>${javafx.version}</version>
         </dependency>
     </dependencies>
     <build>
@@ -37,15 +39,15 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <release>12</release>
+                    <release>${maven.compiler.release}</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.3</version>
                 <configuration>
-                    <release>12</release>
+                    <release>${maven.compiler.release}</release>
                     <jlinkImageName>hellofx</jlinkImageName>
                     <launcher>launcher</launcher>
                     <mainClass>hellofx/org.openjfx.MainApp</mainClass>

CommandLine/Non-modular/CLI/README.md

@@ -1,9 +1,9 @@
 # samples
 
-JavaFX 12 samples to run with different options and build tools.
+JavaFX 13 samples to run with different options and build tools.
 
-Download an appropriate [JDK 12](https://jdk.java.net/12/) for your operating system. Make sure `JAVA_HOME` 
-is properly set to the Java 12 installation directory. 
+Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
+Make sure `JAVA_HOME` is properly set to the JDK installation directory. 
 
 Download [JavaFX SDK](https://gluonhq.com/products/javafx/) for your operating 
 system and unzip to a desired location.
@@ -17,7 +17,7 @@ system and unzip to a desired location.
 If you run on Linux or Mac, follow these steps:
 
     cd CommandLine/Non-modular/CLI/hellofx
-    export PATH_TO_FX=path/to/javafx-sdk-12/lib
+    export PATH_TO_FX=path/to/javafx-sdk-13/lib
     javac --module-path $PATH_TO_FX --add-modules=javafx.controls -d out $(find src -name "*.java")
 
 To run the project:
@@ -45,7 +45,7 @@ To create a fat jar:
 If you run on Windows, follow these steps:
 
     cd CommandLine\Non-modular\CLI\hellofx
-    set PATH_TO_FX="path\to\javafx-sdk-12\lib"
+    set PATH_TO_FX="path\to\javafx-sdk-13\lib"
     dir /s /b src\*.java > sources.txt & javac --module-path %PATH_TO_FX% --add-modules=javafx.controls -d out @sources.txt & del sources.txt
 
 To run the project:

CommandLine/Non-modular/Gradle/README.md

@@ -1,9 +1,9 @@
 # samples
 
-JavaFX 12 samples to run with different options and build tools.
+JavaFX 13 samples to run with different options and build tools.
 
-Download an appropriate [JDK 12](https://jdk.java.net/12/) for your operating system. Make sure `JAVA_HOME` 
-is properly set to the Java 12 installation directory. 
+Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
+Make sure `JAVA_HOME` is properly set to the JDK installation directory. 
 
 ## Non-modular - Gradle
 

CommandLine/Non-modular/Gradle/hellofx/build.gradle

@@ -15,7 +15,7 @@ dependencies {
 }
 
 javafx {
-    version = "12.0.2"
+    version = "13"
     modules = [ 'javafx.controls' ]
 }
 

CommandLine/Non-modular/Maven/README.md

@@ -1,9 +1,9 @@
 # samples
 
-JavaFX 12 samples to run with different options and build tools.
+JavaFX 13 samples to run with different options and build tools.
 
-Download an appropriate [JDK 12](https://jdk.java.net/12/) for your operating system. Make sure `JAVA_HOME` 
-is properly set to the Java 12 installation directory. 
+Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
+Make sure `JAVA_HOME` is properly set to the JDK installation directory. 
 
 ## Non-modular - Maven
 

CommandLine/Non-modular/Maven/hellofx/pom.xml

@@ -9,6 +9,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.release>11</maven.compiler.release>
+        <javafx.version>13</javafx.version>
     </properties>
 
   <name>hellofx</name>
@@ -17,27 +19,29 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-      <version>12.0.2</version>
+      <version>${javafx.version}</version>
     </dependency>
-    <!-- Uncomment for cross-platform fat jar
-    <dependency>
+    <!-- Uncomment for cross-platform fat jar-->
+    <!--
+      <dependency>
         <groupId>org.openjfx</groupId>
         <artifactId>javafx-graphics</artifactId>
-        <version>12.0.2</version>
+        <version>${javafx.version}</version>
         <classifier>win</classifier>
     </dependency>
     <dependency>
         <groupId>org.openjfx</groupId>
         <artifactId>javafx-graphics</artifactId>
-        <version>12.0.2</version>
+        <version>${javafx.version}</version>
         <classifier>linux</classifier>
     </dependency>
     <dependency>
         <groupId>org.openjfx</groupId>
         <artifactId>javafx-graphics</artifactId>
-        <version>12.0.2</version>
+        <version>${javafx.version}</version>
         <classifier>mac</classifier>
-    </dependency> -->
+    </dependency>
+    -->
   </dependencies>
 
   <build>
@@ -47,7 +51,7 @@
               <artifactId>maven-compiler-plugin</artifactId>
               <version>3.8.1</version>
               <configuration>
-                  <release>12</release>
+                  <release>${maven.compiler.release}</release>
               </configuration>
           </plugin>
           <plugin>

HelloFX/CLI/README.md

@@ -1,9 +1,9 @@
 # HelloFX Sample
 
-JavaFX 12 HelloFX sample to run with different options and build tools.
+JavaFX 13 HelloFX sample to run with different options and build tools.
 
-Download an appropriate [JDK 12](https://jdk.java.net/12/) for your operating system. Make sure `JAVA_HOME` 
-is properly set to the Java 12 installation directory. 
+Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
+Make sure `JAVA_HOME` is properly set to the JDK installation directory. 
 
 ## CLI
 
@@ -15,7 +15,7 @@ system and unzip to a desired location.
 If you run on Linux or Mac, follow these steps:
 
     cd HelloFX/CLI/hellofx
-    export PATH_TO_FX=path/to/javafx-sdk-12/lib
+    export PATH_TO_FX=path/to/javafx-sdk-13/lib
 
 Compile:
 
@@ -30,7 +30,7 @@ Run:
 If you run on Windows, follow these steps:
 
     cd HelloFX\CLI\hellofx
-    set PATH_TO_FX="path\to\javafx-sdk-12\lib"
+    set PATH_TO_FX="path\to\javafx-sdk-13\lib"
 
 Compile:
 

HelloFX/Gradle/README.md

@@ -1,9 +1,9 @@
 # HelloFX Sample
 
-JavaFX 12 HelloFX sample to run with different options and build tools.
+JavaFX 13 HelloFX sample to run with different options and build tools.
 
-Download an appropriate [JDK 12](https://jdk.java.net/12/) for your operating system. Make sure `JAVA_HOME` 
-is properly set to the Java 12 installation directory. 
+Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
+Make sure `JAVA_HOME` is properly set to the JDK installation directory. 
 
 ## Gradle
 

HelloFX/Gradle/hellofx/build.gradle

@@ -8,7 +8,7 @@ repositories {
 }
 
 javafx {
-    version = "12.0.2"
+    version = "13"
     modules = [ 'javafx.controls' ]
 }
 

HelloFX/Maven/README.md

@@ -1,9 +1,9 @@
 # HelloFX Sample
 
-JavaFX 12 HelloFX sample to run with different options and build tools.
+JavaFX 13 HelloFX sample to run with different options and build tools.
 
-Download an appropriate [JDK 12](https://jdk.java.net/12/) for your operating system. Make sure `JAVA_HOME` 
-is properly set to the Java 12 installation directory. 
+Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
+Make sure `JAVA_HOME` is properly set to the JDK installation directory. 
 
 ## Maven
 

HelloFX/Maven/hellofx/pom.xml

@@ -16,7 +16,7 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-      <version>12.0.2</version>
+      <version>13</version>
     </dependency>
   </dependencies>
   <build>

IDE/Eclipse/Modular/Gradle/README.md

@@ -1,21 +1,21 @@
 ## Modular samples for Eclipse
 
-JavaFX 12 samples to run from Eclipse with different options and build tools
+JavaFX 13 samples to run from Eclipse with different options and build tools
 
 Version Eclipse: 2019-03 (4.11.0)
 
-Install this patch from MarketPlace: `Java 12 support for Eclipse 2019-03 (4.11)`.
+Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
+Make sure `JAVA_HOME` is properly set to the JDK installation directory.
 
-Download an appropriate [JDK 12](https://jdk.java.net/12/) for your operating system. Make sure `JAVA_HOME` 
-is properly set to the Java 12 installation directory. 
+**N.B**: If you use JDK 12, install this patch from MarketPlace: `Java 12 support for Eclipse 2019-03 (4.11)`.
 
 ### Gradle
 
 For the first time only:
 
 - Make sure you have the Buildship Gradle Integration 3.0 plugin installed.
 
-- Add `org.gradle.java.home` to a `gradle.properties` file, with the path to JDK 12. This file 
+- Add `org.gradle.java.home` to a `gradle.properties` file, with the path to JDK. This file 
 can be part of the project or under the gradle user home `USER_HOME/.gradle`. 
 
 Clone the sample, open it with Eclipse and refresh the Gradle project. 

IDE/Eclipse/Modular/Gradle/hellofx/build.gradle

@@ -10,7 +10,7 @@ repositories {
 }
 
 javafx {
-    version = "12.0.2"
+    version = "13"
     modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
 

IDE/Eclipse/Modular/Gradle/hellofx/gradle.properties

@@ -1,4 +1,4 @@
-## if JAVA_HOME is not JDK 12, set and uncomment:
-#org.gradle.java.home=/path/to/jdk-12/
+## if JAVA_HOME is not JDK, set and uncomment:
+#org.gradle.java.home=/path/to/jdk/
 
 

IDE/Eclipse/Modular/Java/HelloFX/src/org/openjfx/MainApp.java

@@ -16,7 +16,7 @@ public void start(Stage stage) throws Exception {
         Scene scene = new Scene(root);
         scene.getStylesheets().add(getClass().getResource("styles.css").toExternalForm());
 
-        stage.setTitle("JavaFX 12");
+        stage.setTitle("JavaFX 13");
         stage.setScene(scene);
         stage.show();
     }

IDE/Eclipse/Modular/Java/README.md

@@ -1,13 +1,13 @@
 ## Modular samples for Eclipse
 
-JavaFX 12 samples to run from Eclipse with different options and build tools
+JavaFX 13 samples to run from Eclipse with different options and build tools
 
 Version Eclipse: 2019-03 (4.11.0)
 
-Install this patch from MarketPlace: `Java 12 support for Eclipse 2019-03 (4.11)`.
+Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
+Make sure `JAVA_HOME` is properly set to the JDK installation directory.
 
-Download an appropriate [JDK 12](https://jdk.java.net/12/) for your operating system. Make sure `JAVA_HOME` 
-is properly set to the Java 12 installation directory. 
+**N.B**: If you use JDK 12, install this patch from MarketPlace: `Java 12 support for Eclipse 2019-03 (4.11)`.
 
 ### Java
 
@@ -23,13 +23,13 @@ To create and run a custom JRE, from terminal:
 On Linux or Mac run:
 
     cd IDE/Eclipse/Modular/Java/HelloFX
-    export PATH_TO_FX_MODS=path/to/javafx-jmods-12
+    export PATH_TO_FX_MODS=path/to/javafx-jmods-13
     $JAVA_HOME/bin/jlink --module-path $PATH_TO_FX_MODS:bin/hellofx --add-modules=hellofx --output jre
     jre/bin/java -m hellofx/org.openjfx.MainApp
 
 On Windows run:
 
     cd IDE\Eclipse\Modular\Java\HelloFX
-    set PATH_TO_FX_MODS="path\to\javafx-jmods-12"
+    set PATH_TO_FX_MODS="path\to\javafx-jmods-13"
     jlink --module-path "%PATH_TO_FX_MODS%;bin\hellofx" --add-modules=hellofx --output jre
     jre\bin\java -m hellofx/org.openjfx.MainApp