Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#107 Update samples with latest versions #33

Merged
merged 2 commits into from
Jul 31, 2019
Merged

#107 Update samples with latest versions #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2de58c
#107 Update samples with latest versions
jperedadnr Jul 26, 2019
faf9a64
Update samples to latest JavaFX version
jperedadnr Jul 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CommandLine/Modular/Gradle/hellofx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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' ]
}

Expand Down
8 changes: 4 additions & 4 deletions CommandLine/Modular/Maven/hellofx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>12.0.1</version>
<version>12.0.2</version>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use a maven property for this to make future changes easier.

Copy link
Collaborator Author

@jperedadnr jperedadnr Jul 29, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even if we use Maven properties, these will be on top of each pom, so we will have to update every single file either way.

We could add a parent pom for all the maven samples, but I don't think we should, as each sample is isolated.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. However, in this case we update it at one place instead of spreading it across the file.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this applies only if we have two or more dependencies, so it is a little bit overkilling imo

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

</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>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may also move to a maven property to keep all versions consolidated at one place.

<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>
Expand Down
9 changes: 0 additions & 9 deletions CommandLine/Modular/Maven/hellofx/src/main/java/org/openjfx/MainApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions CommandLine/Non-modular/Gradle/hellofx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'application'
id 'org.openjfx.javafxplugin' version '0.0.7'
id 'org.openjfx.javafxplugin' version '0.0.8'
}

repositories {
Expand All @@ -15,7 +15,7 @@ dependencies {
}

javafx {
version = "12"
version = "12.0.2"
modules = [ 'javafx.controls' ]
}

Expand Down
12 changes: 6 additions & 6 deletions CommandLine/Non-modular/Maven/hellofx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As stated before, these versions can move to maven properties to make future changes easier.

<classifier>mac</classifier>
</dependency> -->
</dependencies>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions HelloFX/Gradle/hellofx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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' ]
}

Expand Down
4 changes: 2 additions & 2 deletions HelloFX/Maven/hellofx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions IDE/Eclipse/Modular/Gradle/hellofx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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' ]
}

Expand Down
1 change: 0 additions & 1 deletion IDE/Eclipse/Modular/Gradle/hellofx/src/main/java/org/openjfx/MainApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion IDE/Eclipse/Modular/Java/HelloFX/src/org/openjfx/MainApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions IDE/Eclipse/Modular/Maven/hellofx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions IDE/Eclipse/Non-Modular/Gradle/hellofx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'application'
id 'org.openjfx.javafxplugin' version '0.0.7'
id 'org.openjfx.javafxplugin' version '0.0.8'
}

repositories {
Expand All @@ -11,7 +11,7 @@ dependencies {
}

javafx {
version = "12"
version = "12.0.2"
modules = [ 'javafx.controls', 'javafx.fxml' ]
}

Expand Down
1 change: 0 additions & 1 deletion IDE/Eclipse/Non-Modular/Gradle/hellofx/src/main/java/org/openjfx/MainApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions IDE/Eclipse/Non-Modular/Maven/hellofx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions IDE/IntelliJ/Modular/Gradle/hellofx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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' ]
}

Expand Down
1 change: 0 additions & 1 deletion IDE/IntelliJ/Modular/Gradle/hellofx/src/main/java/org/openjfx/MainApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions IDE/IntelliJ/Modular/Gradle/hellofx/src/main/resources/org/openjfx/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.button {
-fx-font-weight: bold;
.label {
-fx-text-fill: blue;
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remember to close PR #30 after we merge this PR.

1 change: 0 additions & 1 deletion IDE/IntelliJ/Modular/Java/hellofx/src/org/openjfx/MainApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions IDE/IntelliJ/Modular/Maven/hellofx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions IDE/IntelliJ/Non-Modular/Gradle/hellofx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'application'
id 'org.openjfx.javafxplugin' version '0.0.7'
id 'org.openjfx.javafxplugin' version '0.0.8'
}

repositories {
Expand All @@ -11,7 +11,7 @@ dependencies {
}

javafx {
version = "12"
version = "12.0.2"
modules = [ 'javafx.controls', 'javafx.fxml' ]
}

Expand Down
Loading