From 20f62b5b1080aef6a722f736c5b6252da046087d Mon Sep 17 00:00:00 2001 From: Josh Larson Date: Sun, 10 Jun 2018 14:44:33 -0500 Subject: [PATCH] Updated dependencies and java version --- .gitmodules | 6 +++--- PSWGCommon | 1 - build.gradle | 15 ++++++--------- pswgcommon | 1 + settings.gradle | 2 +- .../projectswg/common/javafx/FXMLUtilities.java | 2 +- .../common/javafx/ResourceUtilities.java | 4 ++-- .../common/javafx/hotswap/HotswapManager.java | 4 ++-- .../common/javafx/intent/HotswapIntent.java | 2 +- .../intent/HotswapNodeRegistrationIntent.java | 2 +- 10 files changed, 18 insertions(+), 21 deletions(-) delete mode 160000 PSWGCommon create mode 160000 pswgcommon diff --git a/.gitmodules b/.gitmodules index 1fadeca..856c61c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "PSWGCommon"] - path = PSWGCommon - url = https://bitbucket.org/projectswg/pswgcommon +[submodule "pswgcommon"] + path = pswgcommon + url = git@bitbucket.org:projectswg/pswgcommon.git diff --git a/PSWGCommon b/PSWGCommon deleted file mode 160000 index 0e8213d..0000000 --- a/PSWGCommon +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0e8213d64f165358050444ae63398922877a5687 diff --git a/build.gradle b/build.gradle index 69389e9..b4e270c 100644 --- a/build.gradle +++ b/build.gradle @@ -2,18 +2,15 @@ plugins { id 'java' } -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 9 +targetCompatibility = 9 -jar { - from sourceSets.main.allSource - archiveName = "PSWGCommonFX.jar" +repositories { + jcenter() } dependencies { - compile project(':PSWGCommon') + compile project(':pswgcommon') + testCompile 'junit:junit:4.12' } -task wrapper(type: Wrapper) { - gradleVersion = "4.4" -} diff --git a/pswgcommon b/pswgcommon new file mode 160000 index 0000000..e2532b3 --- /dev/null +++ b/pswgcommon @@ -0,0 +1 @@ +Subproject commit e2532b34eda75626a06ace134211bd19c3ccbde5 diff --git a/settings.gradle b/settings.gradle index e2bb59e..8ce3b4a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'PSWGCommon' +include 'pswgcommon' diff --git a/src/main/java/com/projectswg/common/javafx/FXMLUtilities.java b/src/main/java/com/projectswg/common/javafx/FXMLUtilities.java index c17ef8e..c85a259 100644 --- a/src/main/java/com/projectswg/common/javafx/FXMLUtilities.java +++ b/src/main/java/com/projectswg/common/javafx/FXMLUtilities.java @@ -27,7 +27,7 @@ ***********************************************************************************/ package com.projectswg.common.javafx; -import com.projectswg.common.debug.Log; +import me.joshlarson.jlcommon.log.Log; import com.projectswg.common.utilities.LocalUtilities; import javafx.fxml.FXMLLoader; import javafx.scene.control.Alert; diff --git a/src/main/java/com/projectswg/common/javafx/ResourceUtilities.java b/src/main/java/com/projectswg/common/javafx/ResourceUtilities.java index 56621b0..3beeac2 100644 --- a/src/main/java/com/projectswg/common/javafx/ResourceUtilities.java +++ b/src/main/java/com/projectswg/common/javafx/ResourceUtilities.java @@ -60,11 +60,11 @@ public class ResourceUtilities { } public static URL getSourceResource(String path) { - return SOURCE.get().getClassLoader().getResource(path); + return SOURCE.get().getResource(path); } public static InputStream getSourceResourceAsStream(String path) { - return SOURCE.get().getClassLoader().getResourceAsStream(path); + return SOURCE.get().getResourceAsStream(path); } } diff --git a/src/main/java/com/projectswg/common/javafx/hotswap/HotswapManager.java b/src/main/java/com/projectswg/common/javafx/hotswap/HotswapManager.java index 3c0357b..0c26e75 100644 --- a/src/main/java/com/projectswg/common/javafx/hotswap/HotswapManager.java +++ b/src/main/java/com/projectswg/common/javafx/hotswap/HotswapManager.java @@ -1,7 +1,7 @@ package com.projectswg.common.javafx.hotswap; -import com.projectswg.common.control.IntentManager; -import com.projectswg.common.debug.Log; +import me.joshlarson.jlcommon.control.IntentManager; +import me.joshlarson.jlcommon.log.Log; import com.projectswg.common.javafx.intent.HotswapIntent; import com.projectswg.common.javafx.intent.HotswapNodeRegistrationIntent; diff --git a/src/main/java/com/projectswg/common/javafx/intent/HotswapIntent.java b/src/main/java/com/projectswg/common/javafx/intent/HotswapIntent.java index f1a78e1..93a5fbd 100644 --- a/src/main/java/com/projectswg/common/javafx/intent/HotswapIntent.java +++ b/src/main/java/com/projectswg/common/javafx/intent/HotswapIntent.java @@ -1,7 +1,7 @@ package com.projectswg.common.javafx.intent; -import com.projectswg.common.control.Intent; import javafx.scene.Node; +import me.joshlarson.jlcommon.control.Intent; public class HotswapIntent extends Intent { diff --git a/src/main/java/com/projectswg/common/javafx/intent/HotswapNodeRegistrationIntent.java b/src/main/java/com/projectswg/common/javafx/intent/HotswapNodeRegistrationIntent.java index b97b807..409d660 100644 --- a/src/main/java/com/projectswg/common/javafx/intent/HotswapNodeRegistrationIntent.java +++ b/src/main/java/com/projectswg/common/javafx/intent/HotswapNodeRegistrationIntent.java @@ -1,7 +1,7 @@ package com.projectswg.common.javafx.intent; -import com.projectswg.common.control.Intent; import com.projectswg.common.javafx.hotswap.HotswapComponent; +import me.joshlarson.jlcommon.control.Intent; public class HotswapNodeRegistrationIntent extends Intent {