Merge pull request openjfx#33 from jperedadnr/master

#107 Update samples with latest versions
jgneff · Jul 31, 2019 · 8858a93 · 8858a93
2 parents e98a05e + faf9a64
commit 8858a93
Show file tree

Hide file tree

Showing 37 changed files with 69 additions and 87 deletions.
diff --git a/CommandLine/Modular/Gradle/hellofx/build.gradle b/CommandLine/Modular/Gradle/hellofx/build.gradle
@@ -1,15 +1,15 @@
 plugins {
   id 'application'
-  id 'org.openjfx.javafxplugin' version '0.0.7'
-  id 'org.beryx.jlink' version '2.9.4'
+  id 'org.openjfx.javafxplugin' version '0.0.8'
+  id 'org.beryx.jlink' version '2.12.0'
 }
 
 repositories {
     mavenCentral()
 }
 
 javafx {
-    version = "12"
+    version = "12.0.2"
     modules = [ 'javafx.controls' ]
 }
 

diff --git a/CommandLine/Modular/Maven/hellofx/pom.xml b/CommandLine/Modular/Maven/hellofx/pom.xml
@@ -22,28 +22,28 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>12.0.1</version>
+            <version>12.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>12.0.1</version>
+            <version>12.0.2</version>
         </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.1</version>
                 <configuration>
                     <release>12</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.2</version>
+                <version>0.0.3</version>
                 <configuration>
                     <release>12</release>
                     <jlinkImageName>hellofx</jlinkImageName>

diff --git a/CommandLine/Modular/Maven/hellofx/src/main/java/org/openjfx/MainApp.java b/CommandLine/Modular/Maven/hellofx/src/main/java/org/openjfx/MainApp.java
@@ -1,7 +1,6 @@
 package org.openjfx;
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -22,14 +21,6 @@ public void start(Stage stage) throws Exception {
         stage.show();
     }
 
-    /**
-     * The main() method is ignored in correctly deployed JavaFX application.
-     * main() serves only as fallback in case the application can not be
-     * launched through deployment artifacts, e.g., in IDEs with limited FX
-     * support. NetBeans ignores main().
-     *
-     * @param args the command line arguments
-     */
     public static void main(String[] args) {
         launch(args);
     }

diff --git a/CommandLine/Non-modular/Gradle/hellofx/build.gradle b/CommandLine/Non-modular/Gradle/hellofx/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'application'
-    id 'org.openjfx.javafxplugin' version '0.0.7'
+    id 'org.openjfx.javafxplugin' version '0.0.8'
 }
 
 repositories {
@@ -15,7 +15,7 @@ dependencies {
 }
 
 javafx {
-    version = "12"
+    version = "12.0.2"
     modules = [ 'javafx.controls' ]
 }
 

diff --git a/CommandLine/Non-modular/Maven/hellofx/pom.xml b/CommandLine/Non-modular/Maven/hellofx/pom.xml
@@ -17,25 +17,25 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-      <version>12.0.1</version>
+      <version>12.0.2</version>
     </dependency>
     <!-- Uncomment for cross-platform fat jar
     <dependency>
         <groupId>org.openjfx</groupId>
         <artifactId>javafx-graphics</artifactId>
-        <version>12.0.1</version>
+        <version>12.0.2</version>
         <classifier>win</classifier>
     </dependency>
     <dependency>
         <groupId>org.openjfx</groupId>
         <artifactId>javafx-graphics</artifactId>
-        <version>12.0.1</version>
+        <version>12.0.2</version>
         <classifier>linux</classifier>
     </dependency>
     <dependency>
         <groupId>org.openjfx</groupId>
         <artifactId>javafx-graphics</artifactId>
-        <version>12.0.1</version>
+        <version>12.0.2</version>
         <classifier>mac</classifier>
     </dependency> -->
   </dependencies>
@@ -45,15 +45,15 @@
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-compiler-plugin</artifactId>
-              <version>3.8.0</version>
+              <version>3.8.1</version>
               <configuration>
                   <release>12</release>
               </configuration>
           </plugin>
           <plugin>
               <groupId>org.openjfx</groupId>
               <artifactId>javafx-maven-plugin</artifactId>
-              <version>0.0.2</version>
+              <version>0.0.3</version>
               <configuration>
                   <mainClass>hellofx.HelloFX</mainClass>
               </configuration>

diff --git a/HelloFX/Gradle/hellofx/build.gradle b/HelloFX/Gradle/hellofx/build.gradle
@@ -1,14 +1,14 @@
 plugins {
   id 'application'
-  id 'org.openjfx.javafxplugin' version '0.0.7'
+  id 'org.openjfx.javafxplugin' version '0.0.8'
 }
 
 repositories {
     mavenCentral()
 }
 
 javafx {
-    version = "12"
+    version = "12.0.2"
     modules = [ 'javafx.controls' ]
 }
 

diff --git a/HelloFX/Maven/hellofx/pom.xml b/HelloFX/Maven/hellofx/pom.xml
@@ -16,15 +16,15 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-      <version>12.0.1</version>
+      <version>12.0.2</version>
     </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
         <groupId>org.openjfx</groupId>
         <artifactId>javafx-maven-plugin</artifactId>
-        <version>0.0.2</version>
+        <version>0.0.3</version>
         <configuration>
           <mainClass>HelloFX</mainClass>
         </configuration>

diff --git a/IDE/Eclipse/Modular/Gradle/hellofx/build.gradle b/IDE/Eclipse/Modular/Gradle/hellofx/build.gradle
@@ -1,16 +1,16 @@
 plugins {
   id 'application'
   id 'eclipse'
-  id 'org.openjfx.javafxplugin' version '0.0.7'
-  id 'org.beryx.jlink' version '2.9.4'
+  id 'org.openjfx.javafxplugin' version '0.0.8'
+  id 'org.beryx.jlink' version '2.12.0'
 }
 
 repositories {
     mavenCentral()
 }
 
 javafx {
-    version = "12"
+    version = "12.0.2"
     modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
 

diff --git a/IDE/Eclipse/Modular/Gradle/hellofx/src/main/java/org/openjfx/MainApp.java b/IDE/Eclipse/Modular/Gradle/hellofx/src/main/java/org/openjfx/MainApp.java
@@ -1,7 +1,6 @@
 package org.openjfx;
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;

diff --git a/IDE/Eclipse/Modular/Java/HelloFX/src/org/openjfx/MainApp.java b/IDE/Eclipse/Modular/Java/HelloFX/src/org/openjfx/MainApp.java
@@ -1,7 +1,6 @@
 package org.openjfx;
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;

diff --git a/IDE/Eclipse/Modular/Maven/hellofx/pom.xml b/IDE/Eclipse/Modular/Maven/hellofx/pom.xml
@@ -13,28 +13,28 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>12.0.1</version>
+            <version>12.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>12.0.1</version>
+            <version>12.0.2</version>
         </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.1</version>
                 <configuration>
                     <release>12</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.2</version>
+                <version>0.0.3</version>
                 <configuration>
                     <release>12</release>
                     <jlinkImageName>hellofx</jlinkImageName>

diff --git a/IDE/Eclipse/Non-Modular/Gradle/hellofx/build.gradle b/IDE/Eclipse/Non-Modular/Gradle/hellofx/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'application'
-  id 'org.openjfx.javafxplugin' version '0.0.7'
+  id 'org.openjfx.javafxplugin' version '0.0.8'
 }
 
 repositories {
@@ -11,7 +11,7 @@ dependencies {
 }
 
 javafx {
-    version = "12"
+    version = "12.0.2"
     modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
 

diff --git a/IDE/Eclipse/Non-Modular/Gradle/hellofx/src/main/java/org/openjfx/MainApp.java b/IDE/Eclipse/Non-Modular/Gradle/hellofx/src/main/java/org/openjfx/MainApp.java
@@ -1,7 +1,6 @@
 package org.openjfx;
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;

diff --git a/IDE/Eclipse/Non-Modular/Maven/hellofx/pom.xml b/IDE/Eclipse/Non-Modular/Maven/hellofx/pom.xml
@@ -13,28 +13,28 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>12.0.1</version>
+            <version>12.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>12.0.1</version>
+            <version>12.0.2</version>
         </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.1</version>
                 <configuration>
                     <release>12</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.2</version>
+                <version>0.0.3</version>
                 <configuration>
                     <mainClass>org.openjfx.hellofx.App</mainClass>
                 </configuration>

diff --git a/IDE/IntelliJ/Modular/Gradle/hellofx/build.gradle b/IDE/IntelliJ/Modular/Gradle/hellofx/build.gradle
@@ -1,15 +1,15 @@
 plugins {
   id 'application'
-  id 'org.openjfx.javafxplugin' version '0.0.7'
-  id 'org.beryx.jlink' version '2.9.4'
+  id 'org.openjfx.javafxplugin' version '0.0.8'
+  id 'org.beryx.jlink' version '2.12.0'
 }
 
 repositories {
     mavenCentral()
 }
 
 javafx {
-    version = "12"
+    version = "12.0.2"
     modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
 

diff --git a/IDE/IntelliJ/Modular/Gradle/hellofx/src/main/java/org/openjfx/MainApp.java b/IDE/IntelliJ/Modular/Gradle/hellofx/src/main/java/org/openjfx/MainApp.java
@@ -1,7 +1,6 @@
 package org.openjfx;
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;

diff --git a/IDE/IntelliJ/Modular/Gradle/hellofx/src/main/resources/org/openjfx/styles.css b/IDE/IntelliJ/Modular/Gradle/hellofx/src/main/resources/org/openjfx/styles.css
@@ -1,3 +1,3 @@
-.button {
-    -fx-font-weight: bold;
+.label {
+    -fx-text-fill: blue;
 }
diff --git a/IDE/IntelliJ/Modular/Java/hellofx/src/org/openjfx/MainApp.java b/IDE/IntelliJ/Modular/Java/hellofx/src/org/openjfx/MainApp.java
@@ -1,7 +1,6 @@
 package org.openjfx;
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;

diff --git a/IDE/IntelliJ/Modular/Maven/hellofx/pom.xml b/IDE/IntelliJ/Modular/Maven/hellofx/pom.xml
@@ -13,28 +13,28 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>12</version>
+            <version>12.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>12</version>
+            <version>12.0.2</version>
         </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.1</version>
                 <configuration>
                     <release>12</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.2</version>
+                <version>0.0.3</version>
                 <configuration>
                     <release>12</release>
                     <jlinkImageName>hellofx</jlinkImageName>

diff --git a/IDE/IntelliJ/Non-Modular/Gradle/hellofx/build.gradle b/IDE/IntelliJ/Non-Modular/Gradle/hellofx/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'application'
-  id 'org.openjfx.javafxplugin' version '0.0.7'
+  id 'org.openjfx.javafxplugin' version '0.0.8'
 }
 
 repositories {
@@ -11,7 +11,7 @@ dependencies {
 }
 
 javafx {
-    version = "12"
+    version = "12.0.2"
     modules = [ 'javafx.controls', 'javafx.fxml' ]
 }