Skip to content

Commit

Permalink
[javafx] update to JavaFX 13 (#6020)
Browse files Browse the repository at this point in the history
I know there is a comment somewhere with a workaround to fix when we
bump, but I can't find it right now...
  • Loading branch information
grimreaper authored and karianna committed Sep 13, 2019
1 parent 4da86b9 commit 661f27b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ plugins {
}

javafx {
version = "12.0.2"
version = "13"
modules = [ 'javafx.controls', 'javafx.web', 'javafx.swing', 'javafx.fxml', 'javafx.graphics' ]
}

Expand Down
10 changes: 0 additions & 10 deletions code/src/utest/pcgen/gui3/dialog/AboutDialogTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,6 @@ class AboutDialogTest
@Start
private void Start(Stage stage) throws IOException
{
/*
TODO Remove once JavaFx is updated to version 13.
This is a temporary fix for https://github.com/javafxports/openjdk-jfx/issues/66.
https://github.com/PCGen/pcgen/pull/5973
*/
if (SystemUtils.IS_OS_WINDOWS)
{
System.load("C:\\Windows\\System32\\WindowsCodecs.dll");
}

FXMLLoader loader = new FXMLLoader();
URL resource = AboutDialogController.class.getResource("AboutDialog.fxml");
assert resource != null;
Expand Down
10 changes: 0 additions & 10 deletions code/src/utest/pcgen/gui3/preloader/PCGenPreloaderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,6 @@ class PCGenPreloaderTest
@Start
private void Start(Stage stage) throws IOException
{
/*
TODO Remove once JavaFx is updated to version 13.
This is a temporary fix for https://github.com/javafxports/openjdk-jfx/issues/66.
https://github.com/PCGen/pcgen/pull/5973
*/
if (SystemUtils.IS_OS_WINDOWS)
{
System.load("C:\\Windows\\System32\\WindowsCodecs.dll");
}

FXMLLoader loader = new FXMLLoader();
loader.setLocation(PCGenPreloader.class.getResource("PCGenPreloader.fxml"));
loader.setResources(LanguageBundle.getBundle());
Expand Down

0 comments on commit 661f27b

Please sign in to comment.