diff --git a/CommandLine/Modular/CLI/README.md b/CommandLine/Modular/CLI/README.md index b9a3a45..a26eb29 100644 --- a/CommandLine/Modular/CLI/README.md +++ b/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: diff --git a/CommandLine/Modular/Gradle/README.md b/CommandLine/Modular/Gradle/README.md index 5514c6b..9b2d8c3 100644 --- a/CommandLine/Modular/Gradle/README.md +++ b/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 diff --git a/CommandLine/Modular/Gradle/hellofx/build.gradle b/CommandLine/Modular/Gradle/hellofx/build.gradle index 28621c7..b25ad8c 100644 --- a/CommandLine/Modular/Gradle/hellofx/build.gradle +++ b/CommandLine/Modular/Gradle/hellofx/build.gradle @@ -9,7 +9,7 @@ repositories { } javafx { - version = "12.0.2" + version = "13" modules = [ 'javafx.controls' ] } diff --git a/CommandLine/Modular/Maven/README.md b/CommandLine/Modular/Maven/README.md index f6739c5..4676e68 100644 --- a/CommandLine/Modular/Maven/README.md +++ b/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 diff --git a/CommandLine/Modular/Maven/hellofx/pom.xml b/CommandLine/Modular/Maven/hellofx/pom.xml index eb1fa1a..25c3ad2 100644 --- a/CommandLine/Modular/Maven/hellofx/pom.xml +++ b/CommandLine/Modular/Maven/hellofx/pom.xml @@ -11,6 +11,8 @@ UTF-8 + 11 + 13 @@ -22,12 +24,12 @@ org.openjfx javafx-controls - 12.0.2 + ${javafx.version} org.openjfx javafx-fxml - 12.0.2 + ${javafx.version} @@ -37,7 +39,7 @@ maven-compiler-plugin 3.8.1 - 12 + ${maven.compiler.release} @@ -45,7 +47,7 @@ javafx-maven-plugin 0.0.3 - 12 + ${maven.compiler.release} hellofx launcher hellofx/org.openjfx.MainApp diff --git a/CommandLine/Non-modular/CLI/README.md b/CommandLine/Non-modular/CLI/README.md index 5a8427c..fbe5129 100644 --- a/CommandLine/Non-modular/CLI/README.md +++ b/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: diff --git a/CommandLine/Non-modular/Gradle/README.md b/CommandLine/Non-modular/Gradle/README.md index 0b4a080..8633d8b 100644 --- a/CommandLine/Non-modular/Gradle/README.md +++ b/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 diff --git a/CommandLine/Non-modular/Gradle/hellofx/build.gradle b/CommandLine/Non-modular/Gradle/hellofx/build.gradle index d56a3c1..c837d65 100644 --- a/CommandLine/Non-modular/Gradle/hellofx/build.gradle +++ b/CommandLine/Non-modular/Gradle/hellofx/build.gradle @@ -15,7 +15,7 @@ dependencies { } javafx { - version = "12.0.2" + version = "13" modules = [ 'javafx.controls' ] } diff --git a/CommandLine/Non-modular/Maven/README.md b/CommandLine/Non-modular/Maven/README.md index b4b06b3..7d2d37c 100644 --- a/CommandLine/Non-modular/Maven/README.md +++ b/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 diff --git a/CommandLine/Non-modular/Maven/hellofx/pom.xml b/CommandLine/Non-modular/Maven/hellofx/pom.xml index d60a53d..aac2d8b 100644 --- a/CommandLine/Non-modular/Maven/hellofx/pom.xml +++ b/CommandLine/Non-modular/Maven/hellofx/pom.xml @@ -9,6 +9,8 @@ UTF-8 + 11 + 13 hellofx @@ -17,27 +19,29 @@ org.openjfx javafx-controls - 12.0.2 + ${javafx.version} - + + + --> @@ -47,7 +51,7 @@ maven-compiler-plugin 3.8.1 - 12 + ${maven.compiler.release} diff --git a/HelloFX/CLI/README.md b/HelloFX/CLI/README.md index 2e5ebbe..d90fe90 100644 --- a/HelloFX/CLI/README.md +++ b/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: diff --git a/HelloFX/Gradle/README.md b/HelloFX/Gradle/README.md index d3832cb..4127747 100644 --- a/HelloFX/Gradle/README.md +++ b/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 diff --git a/HelloFX/Gradle/hellofx/build.gradle b/HelloFX/Gradle/hellofx/build.gradle index be214f8..c88ddbe 100644 --- a/HelloFX/Gradle/hellofx/build.gradle +++ b/HelloFX/Gradle/hellofx/build.gradle @@ -8,7 +8,7 @@ repositories { } javafx { - version = "12.0.2" + version = "13" modules = [ 'javafx.controls' ] } diff --git a/HelloFX/Maven/README.md b/HelloFX/Maven/README.md index f08092c..fc375b6 100644 --- a/HelloFX/Maven/README.md +++ b/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 diff --git a/HelloFX/Maven/hellofx/pom.xml b/HelloFX/Maven/hellofx/pom.xml index 34c949b..e8258d1 100644 --- a/HelloFX/Maven/hellofx/pom.xml +++ b/HelloFX/Maven/hellofx/pom.xml @@ -16,7 +16,7 @@ org.openjfx javafx-controls - 12.0.2 + 13 diff --git a/IDE/Eclipse/Modular/Gradle/README.md b/IDE/Eclipse/Modular/Gradle/README.md index 6f0f813..8369f62 100644 --- a/IDE/Eclipse/Modular/Gradle/README.md +++ b/IDE/Eclipse/Modular/Gradle/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)`. ### Gradle @@ -15,7 +15,7 @@ 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. diff --git a/IDE/Eclipse/Modular/Gradle/hellofx/build.gradle b/IDE/Eclipse/Modular/Gradle/hellofx/build.gradle index 0e94003..00e579b 100644 --- a/IDE/Eclipse/Modular/Gradle/hellofx/build.gradle +++ b/IDE/Eclipse/Modular/Gradle/hellofx/build.gradle @@ -10,7 +10,7 @@ repositories { } javafx { - version = "12.0.2" + version = "13" modules = [ 'javafx.controls', 'javafx.fxml' ] } diff --git a/IDE/Eclipse/Modular/Gradle/hellofx/gradle.properties b/IDE/Eclipse/Modular/Gradle/hellofx/gradle.properties index d6d5730..a1524d4 100644 --- a/IDE/Eclipse/Modular/Gradle/hellofx/gradle.properties +++ b/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/ diff --git a/IDE/Eclipse/Modular/Java/HelloFX/src/org/openjfx/MainApp.java b/IDE/Eclipse/Modular/Java/HelloFX/src/org/openjfx/MainApp.java index 9c41b5b..f807b7a 100644 --- a/IDE/Eclipse/Modular/Java/HelloFX/src/org/openjfx/MainApp.java +++ b/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(); } diff --git a/IDE/Eclipse/Modular/Java/README.md b/IDE/Eclipse/Modular/Java/README.md index 475fad3..4667261 100644 --- a/IDE/Eclipse/Modular/Java/README.md +++ b/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 diff --git a/IDE/Eclipse/Modular/Maven/README.md b/IDE/Eclipse/Modular/Maven/README.md index 12338a4..3d35f57 100644 --- a/IDE/Eclipse/Modular/Maven/README.md +++ b/IDE/Eclipse/Modular/Maven/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)`. ### Maven @@ -17,8 +17,8 @@ For the first time only: - Add the JavaFX Maven archetypes `org.openjfx:javafx-archetype-simple:0.0.1` and `org.openjfx:javafx-archetype-fxml:0.0.1` -Clone the sample, open it with Eclipse, and make sure the paths for Java 12 and -JavaFX 12 match those on your machine. +Clone the sample, open it with Eclipse, and make sure the paths for JDK and +JavaFX match those on your machine. Run with `Run configurations -> Maven Build -> hellofx`. @@ -30,7 +30,7 @@ Note: on Windows, under Eclipse running Oracle JDK 1.8, you need to add `-Djava. to the JavaFX maven plugin: - /path/to/Java/12/bin/java + /path/to/JDK/bin/java diff --git a/IDE/Eclipse/Modular/Maven/hellofx/pom.xml b/IDE/Eclipse/Modular/Maven/hellofx/pom.xml index e1d666f..21ee9f2 100644 --- a/IDE/Eclipse/Modular/Maven/hellofx/pom.xml +++ b/IDE/Eclipse/Modular/Maven/hellofx/pom.xml @@ -6,19 +6,19 @@ 0.0.1-SNAPSHOT UTF-8 - 12 - 12 + 11 + 13 org.openjfx javafx-controls - 12.0.2 + ${javafx.version} org.openjfx javafx-fxml - 12.0.2 + ${javafx.version} @@ -28,7 +28,7 @@ maven-compiler-plugin 3.8.1 - 12 + ${maven.compiler.release} @@ -36,7 +36,7 @@ javafx-maven-plugin 0.0.3 - 12 + ${maven.compiler.release} hellofx launcher hellofx/org.openjfx.hellofx.App diff --git a/IDE/Eclipse/Non-Modular/Gradle/README.md b/IDE/Eclipse/Non-Modular/Gradle/README.md index 8bbb886..aeadb79 100644 --- a/IDE/Eclipse/Non-Modular/Gradle/README.md +++ b/IDE/Eclipse/Non-Modular/Gradle/README.md @@ -1,19 +1,19 @@ ## Non-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 Clone the sample, add a `gradle.properties` file with this property: - org.gradle.java.home=/path/to/Java/12 + org.gradle.java.home=/path/to/JDK Open it with Eclipse and refresh the Gradle project. diff --git a/IDE/Eclipse/Non-Modular/Gradle/hellofx/build.gradle b/IDE/Eclipse/Non-Modular/Gradle/hellofx/build.gradle index 1b75312..f4f9324 100644 --- a/IDE/Eclipse/Non-Modular/Gradle/hellofx/build.gradle +++ b/IDE/Eclipse/Non-Modular/Gradle/hellofx/build.gradle @@ -11,7 +11,7 @@ dependencies { } javafx { - version = "12.0.2" + version = "13" modules = [ 'javafx.controls', 'javafx.fxml' ] } diff --git a/IDE/Eclipse/Non-Modular/Java/README.md b/IDE/Eclipse/Non-Modular/Java/README.md index 18b935a..2cb5e9c 100644 --- a/IDE/Eclipse/Non-Modular/Java/README.md +++ b/IDE/Eclipse/Non-Modular/Java/README.md @@ -1,13 +1,13 @@ ## Non-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 @@ -17,13 +17,12 @@ For the first time only: system and unzip to a desired location. - Open Eclipse and create a string substitution variable under `Preferences->Run/Debug->String Substitution`, named `PATH_TO_FX` and -pointing to the JavaFX 12 lib folder. +pointing to the JavaFX 13 lib folder. - Create a User Library under `Eclipse -> Window -> Preferences -> Java -> Build Path -> User Libraries -> New`. -Name it `JavaFX12` and include the jars under the lib folder from JavaFX 12. +Name it `JavaFX13` and include the jars under the lib folder from JavaFX 13. -Clone the sample, open it with Eclipse, and make sure the paths for Java 12 and -JavaFX 12 match those on your machine. +Clone the sample, open it with Eclipse, and make sure the paths for JDK and JavaFX match those on your machine. Build the project and run with Run configurations-> Java Application -> HelloFX. diff --git a/IDE/Eclipse/Non-Modular/Java/hellofx/.classpath b/IDE/Eclipse/Non-Modular/Java/hellofx/.classpath index 3fa8358..20413e2 100644 --- a/IDE/Eclipse/Non-Modular/Java/hellofx/.classpath +++ b/IDE/Eclipse/Non-Modular/Java/hellofx/.classpath @@ -6,6 +6,6 @@ - + diff --git a/IDE/Eclipse/Non-Modular/Maven/README.md b/IDE/Eclipse/Non-Modular/Maven/README.md index 4c3df69..9cb3aed 100644 --- a/IDE/Eclipse/Non-Modular/Maven/README.md +++ b/IDE/Eclipse/Non-Modular/Maven/README.md @@ -1,13 +1,13 @@ ## Non-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)`. ### Maven @@ -25,7 +25,7 @@ Note: on Windows, under Eclipse running Oracle JDK 1.8, you need to add `-Djava. to the JavaFX maven plugin: - /path/to/Java/12/bin/java + /path/to/JDK/bin/java diff --git a/IDE/Eclipse/Non-Modular/Maven/hellofx/pom.xml b/IDE/Eclipse/Non-Modular/Maven/hellofx/pom.xml index d9be1ed..0911844 100644 --- a/IDE/Eclipse/Non-Modular/Maven/hellofx/pom.xml +++ b/IDE/Eclipse/Non-Modular/Maven/hellofx/pom.xml @@ -6,19 +6,19 @@ 1.0-SNAPSHOT UTF-8 - 12 - 12 + 11 + 13 org.openjfx javafx-controls - 12.0.2 + ${javafx.version} org.openjfx javafx-fxml - 12.0.2 + ${javafx.version} @@ -28,7 +28,7 @@ maven-compiler-plugin 3.8.1 - 12 + ${maven.compiler.release} diff --git a/IDE/IntelliJ/Modular/Gradle/README.md b/IDE/IntelliJ/Modular/Gradle/README.md index c27bac5..9d5dcef 100644 --- a/IDE/IntelliJ/Modular/Gradle/README.md +++ b/IDE/IntelliJ/Modular/Gradle/README.md @@ -1,11 +1,11 @@ ## Modular samples for IntelliJ -JavaFX 12 samples to run from IntelliJ with different options and build tools +JavaFX 13 samples to run from IntelliJ with different options and build tools Version IntelliJ IDEA 20189.1 -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 jmods](https://gluonhq.com/products/javafx/) for your operating system and unzip to a desired location. diff --git a/IDE/IntelliJ/Modular/Gradle/hellofx/build.gradle b/IDE/IntelliJ/Modular/Gradle/hellofx/build.gradle index 33ddda6..02ea4bc 100644 --- a/IDE/IntelliJ/Modular/Gradle/hellofx/build.gradle +++ b/IDE/IntelliJ/Modular/Gradle/hellofx/build.gradle @@ -9,7 +9,7 @@ repositories { } javafx { - version = "12.0.2" + version = "13" modules = [ 'javafx.controls', 'javafx.fxml' ] } diff --git a/IDE/IntelliJ/Modular/Java/README.md b/IDE/IntelliJ/Modular/Java/README.md index 6805b17..cc87364 100644 --- a/IDE/IntelliJ/Modular/Java/README.md +++ b/IDE/IntelliJ/Modular/Java/README.md @@ -1,11 +1,11 @@ ## Modular samples for IntelliJ -JavaFX 12 samples to run from IntelliJ with different options and build tools +JavaFX 13 samples to run from IntelliJ with different options and build tools Version IntelliJ IDEA 2019.1 -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 jmods](https://gluonhq.com/products/javafx/) for your operating system and unzip to a desired location. @@ -15,11 +15,10 @@ system and unzip to a desired location. Download [JavaFX SDK](https://gluonhq.com/products/javafx/) for your operating system and unzip to a desired location. -Clone the sample, open it with IntelliJ, and make sure the paths for Java 12 and -JavaFX 12 match those on your machine. +Clone the sample, open it with IntelliJ, and make sure the paths for JDK and JavaFX match those on your machine. Define the following Path Variables in Preferences/Settings: - - name `PATH_TO_FX`, value `path/to/javafx-sdk-12/lib` + - name `PATH_TO_FX`, value `path/to/javafx-sdk-13/lib` - name `PATH_SEPARATOR`, value `:` on Linux/Mac, `;` on Windows. Run the `runHelloFX` configuration. @@ -29,13 +28,13 @@ To create and run a custom JRE, from terminal: On Linux or Mac run: cd IDE/IntelliJ/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:mods/production --add-modules hellofx --output jre jre/bin/java -m hellofx/org.openjfx.MainApp On Windows run: cd IDE\IntelliJ\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%;mods\production" --add-modules hellofx --output jre jre\bin\java -m hellofx/org.openjfx.MainApp \ No newline at end of file diff --git a/IDE/IntelliJ/Modular/Java/hellofx/src/org/openjfx/MainApp.java b/IDE/IntelliJ/Modular/Java/hellofx/src/org/openjfx/MainApp.java index e820f18..32adb5a 100644 --- a/IDE/IntelliJ/Modular/Java/hellofx/src/org/openjfx/MainApp.java +++ b/IDE/IntelliJ/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(); } diff --git a/IDE/IntelliJ/Modular/Maven/README.md b/IDE/IntelliJ/Modular/Maven/README.md index 52f6d80..e922c56 100644 --- a/IDE/IntelliJ/Modular/Maven/README.md +++ b/IDE/IntelliJ/Modular/Maven/README.md @@ -1,16 +1,15 @@ ## Modular samples for IntelliJ -JavaFX 12 samples to run from IntelliJ with different options and build tools +JavaFX 13 samples to run from IntelliJ with different options and build tools Version IntelliJ IDEA 2019.1 -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 -Clone the sample, open it with IntelliJ, and make sure the paths for Java 12 and -JavaFX 12 match those on your machine. +Clone the sample, open it with IntelliJ, and make sure the paths for JDK and JavaFX match those on your machine. Run from command line: diff --git a/IDE/IntelliJ/Modular/Maven/hellofx/pom.xml b/IDE/IntelliJ/Modular/Maven/hellofx/pom.xml index 1569ae2..2d50be3 100644 --- a/IDE/IntelliJ/Modular/Maven/hellofx/pom.xml +++ b/IDE/IntelliJ/Modular/Maven/hellofx/pom.xml @@ -6,19 +6,19 @@ 1.0-SNAPSHOT UTF-8 - 12 - 12 + 11 + 13 org.openjfx javafx-controls - 12.0.2 + ${javafx.version} org.openjfx javafx-fxml - 12.0.2 + ${javafx.version} @@ -28,7 +28,7 @@ maven-compiler-plugin 3.8.1 - 12 + ${maven.compiler.release} @@ -36,7 +36,7 @@ javafx-maven-plugin 0.0.3 - 12 + ${maven.compiler.release} hellofx launcher hellofx/org.openjfx.App diff --git a/IDE/IntelliJ/Non-Modular/Gradle/README.md b/IDE/IntelliJ/Non-Modular/Gradle/README.md index cd83c18..a039644 100644 --- a/IDE/IntelliJ/Non-Modular/Gradle/README.md +++ b/IDE/IntelliJ/Non-Modular/Gradle/README.md @@ -1,11 +1,11 @@ ## Non-modular samples for IntelliJ -JavaFX 12 samples to run from IntelliJ with different options and build tools +JavaFX 13 samples to run from IntelliJ with different options and build tools Version IntelliJ IDEA 2019.1 -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 diff --git a/IDE/IntelliJ/Non-Modular/Gradle/hellofx/build.gradle b/IDE/IntelliJ/Non-Modular/Gradle/hellofx/build.gradle index 7fff865..d9b3946 100644 --- a/IDE/IntelliJ/Non-Modular/Gradle/hellofx/build.gradle +++ b/IDE/IntelliJ/Non-Modular/Gradle/hellofx/build.gradle @@ -11,7 +11,7 @@ dependencies { } javafx { - version = "12.0.2" + version = "13" modules = [ 'javafx.controls', 'javafx.fxml' ] } diff --git a/IDE/IntelliJ/Non-Modular/Java/README.md b/IDE/IntelliJ/Non-Modular/Java/README.md index 3c64fe7..e127323 100644 --- a/IDE/IntelliJ/Non-Modular/Java/README.md +++ b/IDE/IntelliJ/Non-Modular/Java/README.md @@ -1,18 +1,17 @@ ## Non-modular samples for IntelliJ -JavaFX 12 samples to run from IntelliJ with different options and build tools +JavaFX 13 samples to run from IntelliJ with different options and build tools Version IntelliJ IDEA 2019.1 -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. ### Java Download [JavaFX SDK](https://gluonhq.com/products/javafx/) for your operating system and unzip to a desired location. -Clone the sample, open it with IntelliJ, and make sure the paths for Java 12 and -JavaFX 12 match those on your machine. +Clone the sample, open it with IntelliJ, and make sure the paths for JDK and JavaFX match those on your machine. Run with `Run -> Edit configurations -> Main`. \ No newline at end of file diff --git a/IDE/IntelliJ/Non-Modular/Maven/README.md b/IDE/IntelliJ/Non-Modular/Maven/README.md index 6765090..33e64b6 100644 --- a/IDE/IntelliJ/Non-Modular/Maven/README.md +++ b/IDE/IntelliJ/Non-Modular/Maven/README.md @@ -1,11 +1,11 @@ ## Non-modular samples for IntelliJ -JavaFX 12 samples to run from IntelliJ with different options and build tools +JavaFX 13 samples to run from IntelliJ with different options and build tools Version IntelliJ IDEA 2019.1 -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 diff --git a/IDE/IntelliJ/Non-Modular/Maven/hellofx/pom.xml b/IDE/IntelliJ/Non-Modular/Maven/hellofx/pom.xml index fe4d3b2..b16d89d 100644 --- a/IDE/IntelliJ/Non-Modular/Maven/hellofx/pom.xml +++ b/IDE/IntelliJ/Non-Modular/Maven/hellofx/pom.xml @@ -6,19 +6,19 @@ 1.0-SNAPSHOT UTF-8 - 12 - 12 + 11 + 13 org.openjfx javafx-controls - 12.0.2 + ${javafx.version} org.openjfx javafx-fxml - 12.0.2 + ${javafx.version} @@ -28,7 +28,7 @@ maven-compiler-plugin 3.8.1 - 12 + ${maven.compiler.release} diff --git a/IDE/NetBeans/Modular/Gradle/README.md b/IDE/NetBeans/Modular/Gradle/README.md index 6322cc4..3a25edb 100644 --- a/IDE/NetBeans/Modular/Gradle/README.md +++ b/IDE/NetBeans/Modular/Gradle/README.md @@ -1,11 +1,11 @@ ## Modular samples for NetBeans -JavaFX 12 samples to run from NetBeans with different options and build tools +JavaFX 13 samples to run from NetBeans with different options and build tools Version NetBeans [11.1](https://netbeans.apache.org/download/nb111/nb111.html) -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. The samples assume NetBeans 10 runs on JDK 12 (this can be set editing the `etc/netbeans.conf` file and setting `netbeans_jdkhome="/path/to/jdk12"`). diff --git a/IDE/NetBeans/Modular/Gradle/hellofx/build.gradle b/IDE/NetBeans/Modular/Gradle/hellofx/build.gradle index 33ddda6..02ea4bc 100644 --- a/IDE/NetBeans/Modular/Gradle/hellofx/build.gradle +++ b/IDE/NetBeans/Modular/Gradle/hellofx/build.gradle @@ -9,7 +9,7 @@ repositories { } javafx { - version = "12.0.2" + version = "13" modules = [ 'javafx.controls', 'javafx.fxml' ] } diff --git a/IDE/NetBeans/Modular/Java/HelloFX/nbproject/project.properties b/IDE/NetBeans/Modular/Java/HelloFX/nbproject/project.properties index 142641b..09fa428 100644 --- a/IDE/NetBeans/Modular/Java/HelloFX/nbproject/project.properties +++ b/IDE/NetBeans/Modular/Java/HelloFX/nbproject/project.properties @@ -44,7 +44,7 @@ javac.compilerargs= javac.deprecation=false javac.external.vm=false javac.modulepath=\ - ${libs.JavaFX12.classpath} + ${libs.JavaFX13.classpath} javac.processormodulepath= javac.processorpath=\ ${javac.classpath} @@ -83,7 +83,7 @@ run.classpath= # To set system properties for unit tests define test-sys-prop.name=value: run.jvmargs= run.modulepath=\ - ${libs.JavaFXMODS12.classpath}:\ + ${libs.JavaFXMODS13.classpath}:\ ${javac.modulepath}:\ ${build.modules.dir} run.test.classpath=\ diff --git a/IDE/NetBeans/Modular/Java/HelloFX/src/hellofx/classes/org/openjfx/MainApp.java b/IDE/NetBeans/Modular/Java/HelloFX/src/hellofx/classes/org/openjfx/MainApp.java index e820f18..32adb5a 100644 --- a/IDE/NetBeans/Modular/Java/HelloFX/src/hellofx/classes/org/openjfx/MainApp.java +++ b/IDE/NetBeans/Modular/Java/HelloFX/src/hellofx/classes/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(); } diff --git a/IDE/NetBeans/Modular/Java/README.md b/IDE/NetBeans/Modular/Java/README.md index 37eac88..5d73fc3 100644 --- a/IDE/NetBeans/Modular/Java/README.md +++ b/IDE/NetBeans/Modular/Java/README.md @@ -1,11 +1,11 @@ ## Modular samples for NetBeans -JavaFX 12 samples to run from NetBeans with different options and build tools +JavaFX 13 samples to run from NetBeans with different options and build tools Version NetBeans [11.1](https://netbeans.apache.org/download/nb111/nb111.html) -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. The samples assume NetBeans 11 runs on JDK 12 (this can be set editing the `etc/netbeans.conf` file and setting `netbeans_jdkhome="/path/to/jdk12"`). @@ -21,13 +21,12 @@ For the first time only: system and unzip to a desired location. - Open NetBeans and create a global Library under `NetBeans -> Tools -> Libraries -> New Library`. -Name it `JavaFX12` and include the jars under the lib folder from JavaFX 12 (but not the `src.zip` file). +Name it `JavaFX13` and include the jars under the lib folder from JavaFX 13 (but not the `src.zip` file). - Create a global Library under `NetBeans -> Tools -> Libraries -> New Library`. -Name it `JavaFXMODS12` and include the folder JavaFX jmods 12. +Name it `JavaFXMODS13` and include the folder JavaFX jmods 13. -Clone the sample, open it with NetBeans, and make sure the paths for Java 12 and -JavaFX 12 match those on your machine. +Clone the sample, open it with NetBeans, and make sure the paths for JDK and JavaFX match those on your machine. Clean and build with regular button to create a custom JRE. Run with regular button. diff --git a/IDE/NetBeans/Modular/Maven/README.md b/IDE/NetBeans/Modular/Maven/README.md index 8e869cb..920e025 100644 --- a/IDE/NetBeans/Modular/Maven/README.md +++ b/IDE/NetBeans/Modular/Maven/README.md @@ -1,11 +1,11 @@ ## Modular samples for NetBeans -JavaFX 12 samples to run from NetBeans with different options and build tools +JavaFX 13 samples to run from NetBeans with different options and build tools Version NetBeans [11.1](https://netbeans.apache.org/download/nb111/nb111.html) -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. The samples assume NetBeans 11 runs on JDK 12 (this can be set editing the `etc/netbeans.conf` file and setting `netbeans_jdkhome="/path/to/jdk12"`). @@ -15,8 +15,7 @@ system and unzip to a desired location. ### Maven -Clone the sample, open it with NetBeans, and make sure the paths for Java 12 and -JavaFX 12 match those on your machine. +Clone the sample, open it with NetBeans, and make sure the paths for JDK and JavaFX match those on your machine. Clean, build and run from the NetBeans usual buttons, or from command line: diff --git a/IDE/NetBeans/Modular/Maven/hellofx/pom.xml b/IDE/NetBeans/Modular/Maven/hellofx/pom.xml index 9872c75..2ea2a8d 100644 --- a/IDE/NetBeans/Modular/Maven/hellofx/pom.xml +++ b/IDE/NetBeans/Modular/Maven/hellofx/pom.xml @@ -6,19 +6,19 @@ 1.0-SNAPSHOT UTF-8 - 12 - 12 + 11 + 13 org.openjfx javafx-controls - 12.0.2 + ${javafx.version} org.openjfx javafx-fxml - 12.0.2 + ${javafx.version} @@ -28,7 +28,7 @@ maven-compiler-plugin 3.8.1 - 12 + ${maven.compiler.release} @@ -36,7 +36,7 @@ javafx-maven-plugin 0.0.3 - 12 + ${maven.compiler.release} hellofx launcher hellofx/org.openjfx.hellofx.App diff --git a/IDE/NetBeans/Non-Modular/Gradle/README.md b/IDE/NetBeans/Non-Modular/Gradle/README.md index 62ec410..0ec49c3 100644 --- a/IDE/NetBeans/Non-Modular/Gradle/README.md +++ b/IDE/NetBeans/Non-Modular/Gradle/README.md @@ -1,11 +1,11 @@ ## Non-modular samples for NetBeans -JavaFX 12 samples to run from NetBeans with different options and build tools +JavaFX 13 samples to run from NetBeans with different options and build tools Version NetBeans [11.1](https://netbeans.apache.org/download/nb111/nb111.html) -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. The samples assume NetBeans 11 runs on JDK 12 (this can be set editing the `etc/netbeans.conf` file and setting `netbeans_jdkhome="/path/to/jdk12"`). diff --git a/IDE/NetBeans/Non-Modular/Gradle/hellofx/build.gradle b/IDE/NetBeans/Non-Modular/Gradle/hellofx/build.gradle index 7fff865..d9b3946 100644 --- a/IDE/NetBeans/Non-Modular/Gradle/hellofx/build.gradle +++ b/IDE/NetBeans/Non-Modular/Gradle/hellofx/build.gradle @@ -11,7 +11,7 @@ dependencies { } javafx { - version = "12.0.2" + version = "13" modules = [ 'javafx.controls', 'javafx.fxml' ] } diff --git a/IDE/NetBeans/Non-Modular/Java/README.md b/IDE/NetBeans/Non-Modular/Java/README.md index 0fd9c7e..4a97b6b 100644 --- a/IDE/NetBeans/Non-Modular/Java/README.md +++ b/IDE/NetBeans/Non-Modular/Java/README.md @@ -1,11 +1,11 @@ ## Non-modular samples for NetBeans -JavaFX 12 samples to run from NetBeans with different options and build tools +JavaFX 13 samples to run from NetBeans with different options and build tools Version NetBeans [11.1](https://netbeans.apache.org/download/nb111/nb111.html) -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. The samples assume NetBeans 11 runs on JDK 12 (this can be set editing the `etc/netbeans.conf` file and setting `netbeans_jdkhome="/path/to/jdk12"`). @@ -18,7 +18,6 @@ For the first time only: system and unzip to a desired location. - Open NetBeans and create a global Library under `NetBeans -> Tools -> Libraries -> New Library`. -Name it `JavaFX12` and include the jars under the lib folder from JavaFX 12 (but not the `src.zip` file). +Name it `JavaFX13` and include the jars under the lib folder from JavaFX 13 (but not the `src.zip` file). -Clone the sample, open it with NetBeans, and make sure the paths for Java 12 and -JavaFX 12 match those on your machine. \ No newline at end of file +Clone the sample, open it with NetBeans, and make sure the paths for JDK and JavaFX match those on your machine. \ No newline at end of file diff --git a/IDE/NetBeans/Non-Modular/Java/hellofx/nbproject/project.properties b/IDE/NetBeans/Non-Modular/Java/hellofx/nbproject/project.properties index 201d75a..c6f8c2e 100644 --- a/IDE/NetBeans/Non-Modular/Java/hellofx/nbproject/project.properties +++ b/IDE/NetBeans/Non-Modular/Java/hellofx/nbproject/project.properties @@ -38,7 +38,7 @@ excludes= includes=** jar.compress=false javac.classpath=\ - ${libs.JAVAFX12.classpath} + ${libs.JAVAFX13.classpath} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -88,7 +88,7 @@ run.classpath=\ run.jvmargs=--add-modules javafx.controls,javafx.fxml run.modulepath=\ ${javac.modulepath}:\ - ${libs.JAVAFX12.classpath} + ${libs.JAVAFX13.classpath} run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} diff --git a/IDE/NetBeans/Non-Modular/Maven/README.md b/IDE/NetBeans/Non-Modular/Maven/README.md index e5249df..66b392a 100644 --- a/IDE/NetBeans/Non-Modular/Maven/README.md +++ b/IDE/NetBeans/Non-Modular/Maven/README.md @@ -1,11 +1,11 @@ ## Non-modular samples for NetBeans -JavaFX 12 samples to run from NetBeans with different options and build tools +JavaFX 13 samples to run from NetBeans with different options and build tools Version NetBeans [11.1](https://netbeans.apache.org/download/nb111/nb111.html) -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. The samples assume NetBeans 11 runs on JDK 12 (this can be set editing the `etc/netbeans.conf` file and setting `netbeans_jdkhome="/path/to/jdk12"`). diff --git a/IDE/NetBeans/Non-Modular/Maven/hellofx/pom.xml b/IDE/NetBeans/Non-Modular/Maven/hellofx/pom.xml index 8c6cbdf..77f42f4 100644 --- a/IDE/NetBeans/Non-Modular/Maven/hellofx/pom.xml +++ b/IDE/NetBeans/Non-Modular/Maven/hellofx/pom.xml @@ -6,19 +6,19 @@ 1.0-SNAPSHOT UTF-8 - 12 - 12 + 11 + 13 org.openjfx javafx-controls - 12.0.2 + ${javafx.version} org.openjfx javafx-fxml - 12.0.2 + ${javafx.version} @@ -28,7 +28,7 @@ maven-compiler-plugin 3.8.1 - 12 + ${maven.compiler.release} diff --git a/README.md b/README.md index cda7b11..9d7ce28 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Description --- This repository contains a collection of HelloFX samples. Each one is a very simple -HelloWorld sample created with JavaFX 12 that can be run with different options and build tools. +HelloWorld sample created with JavaFX 13 that can be run with different options and build tools. The related documentation for each sample can be found [here](https://openjfx.io/openjfx-docs/).