Skip to content

Commit 8858a93

Browse files
author
José Pereda
authored
Merge pull request #33 from jperedadnr/master
#107 Update samples with latest versions
2 parents e98a05e + faf9a64 commit 8858a93

37 files changed

Lines changed: 69 additions & 87 deletions

File tree

‎CommandLine/Modular/Gradle/hellofx/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
plugins {
22
id 'application'
3-
id 'org.openjfx.javafxplugin' version '0.0.7'
4-
id 'org.beryx.jlink' version '2.9.4'
3+
id 'org.openjfx.javafxplugin' version '0.0.8'
4+
id 'org.beryx.jlink' version '2.12.0'
55
}
66

77
repositories {
88
mavenCentral()
99
}
1010

1111
javafx {
12-
version = "12"
12+
version = "12.0.2"
1313
modules = [ 'javafx.controls' ]
1414
}
1515

‎CommandLine/Modular/Maven/hellofx/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@
2222
<dependency>
2323
<groupId>org.openjfx</groupId>
2424
<artifactId>javafx-controls</artifactId>
25-
<version>12.0.1</version>
25+
<version>12.0.2</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>org.openjfx</groupId>
2929
<artifactId>javafx-fxml</artifactId>
30-
<version>12.0.1</version>
30+
<version>12.0.2</version>
3131
</dependency>
3232
</dependencies>
3333
<build>
3434
<plugins>
3535
<plugin>
3636
<groupId>org.apache.maven.plugins</groupId>
3737
<artifactId>maven-compiler-plugin</artifactId>
38-
<version>3.8.0</version>
38+
<version>3.8.1</version>
3939
<configuration>
4040
<release>12</release>
4141
</configuration>
4242
</plugin>
4343
<plugin>
4444
<groupId>org.openjfx</groupId>
4545
<artifactId>javafx-maven-plugin</artifactId>
46-
<version>0.0.2</version>
46+
<version>0.0.3</version>
4747
<configuration>
4848
<release>12</release>
4949
<jlinkImageName>hellofx</jlinkImageName>

‎CommandLine/Modular/Maven/hellofx/src/main/java/org/openjfx/MainApp.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.openjfx;
22

33
import javafx.application.Application;
4-
import static javafx.application.Application.launch;
54
import javafx.fxml.FXMLLoader;
65
import javafx.scene.Parent;
76
import javafx.scene.Scene;
@@ -22,14 +21,6 @@ public void start(Stage stage) throws Exception {
2221
stage.show();
2322
}
2423

25-
/**
26-
* The main() method is ignored in correctly deployed JavaFX application.
27-
* main() serves only as fallback in case the application can not be
28-
* launched through deployment artifacts, e.g., in IDEs with limited FX
29-
* support. NetBeans ignores main().
30-
*
31-
* @param args the command line arguments
32-
*/
3324
public static void main(String[] args) {
3425
launch(args);
3526
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'application'
3-
id 'org.openjfx.javafxplugin' version '0.0.7'
3+
id 'org.openjfx.javafxplugin' version '0.0.8'
44
}
55

66
repositories {
@@ -15,7 +15,7 @@ dependencies {
1515
}
1616

1717
javafx {
18-
version = "12"
18+
version = "12.0.2"
1919
modules = [ 'javafx.controls' ]
2020
}
2121

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@
1717
<dependency>
1818
<groupId>org.openjfx</groupId>
1919
<artifactId>javafx-controls</artifactId>
20-
<version>12.0.1</version>
20+
<version>12.0.2</version>
2121
</dependency>
2222
<!-- Uncomment for cross-platform fat jar
2323
<dependency>
2424
<groupId>org.openjfx</groupId>
2525
<artifactId>javafx-graphics</artifactId>
26-
<version>12.0.1</version>
26+
<version>12.0.2</version>
2727
<classifier>win</classifier>
2828
</dependency>
2929
<dependency>
3030
<groupId>org.openjfx</groupId>
3131
<artifactId>javafx-graphics</artifactId>
32-
<version>12.0.1</version>
32+
<version>12.0.2</version>
3333
<classifier>linux</classifier>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.openjfx</groupId>
3737
<artifactId>javafx-graphics</artifactId>
38-
<version>12.0.1</version>
38+
<version>12.0.2</version>
3939
<classifier>mac</classifier>
4040
</dependency> -->
4141
</dependencies>
@@ -45,15 +45,15 @@
4545
<plugin>
4646
<groupId>org.apache.maven.plugins</groupId>
4747
<artifactId>maven-compiler-plugin</artifactId>
48-
<version>3.8.0</version>
48+
<version>3.8.1</version>
4949
<configuration>
5050
<release>12</release>
5151
</configuration>
5252
</plugin>
5353
<plugin>
5454
<groupId>org.openjfx</groupId>
5555
<artifactId>javafx-maven-plugin</artifactId>
56-
<version>0.0.2</version>
56+
<version>0.0.3</version>
5757
<configuration>
5858
<mainClass>hellofx.HelloFX</mainClass>
5959
</configuration>

‎HelloFX/Gradle/hellofx/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
plugins {
22
id 'application'
3-
id 'org.openjfx.javafxplugin' version '0.0.7'
3+
id 'org.openjfx.javafxplugin' version '0.0.8'
44
}
55

66
repositories {
77
mavenCentral()
88
}
99

1010
javafx {
11-
version = "12"
11+
version = "12.0.2"
1212
modules = [ 'javafx.controls' ]
1313
}
1414

‎HelloFX/Maven/hellofx/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
<dependency>
1717
<groupId>org.openjfx</groupId>
1818
<artifactId>javafx-controls</artifactId>
19-
<version>12.0.1</version>
19+
<version>12.0.2</version>
2020
</dependency>
2121
</dependencies>
2222
<build>
2323
<plugins>
2424
<plugin>
2525
<groupId>org.openjfx</groupId>
2626
<artifactId>javafx-maven-plugin</artifactId>
27-
<version>0.0.2</version>
27+
<version>0.0.3</version>
2828
<configuration>
2929
<mainClass>HelloFX</mainClass>
3030
</configuration>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
plugins {
22
id 'application'
33
id 'eclipse'
4-
id 'org.openjfx.javafxplugin' version '0.0.7'
5-
id 'org.beryx.jlink' version '2.9.4'
4+
id 'org.openjfx.javafxplugin' version '0.0.8'
5+
id 'org.beryx.jlink' version '2.12.0'
66
}
77

88
repositories {
99
mavenCentral()
1010
}
1111

1212
javafx {
13-
version = "12"
13+
version = "12.0.2"
1414
modules = [ 'javafx.controls', 'javafx.fxml' ]
1515
}
1616

‎IDE/Eclipse/Modular/Gradle/hellofx/src/main/java/org/openjfx/MainApp.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.openjfx;
22

33
import javafx.application.Application;
4-
import static javafx.application.Application.launch;
54
import javafx.fxml.FXMLLoader;
65
import javafx.scene.Parent;
76
import javafx.scene.Scene;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.openjfx;
22

33
import javafx.application.Application;
4-
import static javafx.application.Application.launch;
54
import javafx.fxml.FXMLLoader;
65
import javafx.scene.Parent;
76
import javafx.scene.Scene;

0 commit comments

Comments
 (0)