Updated dependencies and java version

This commit is contained in:
Josh Larson
2018-06-10 14:44:33 -05:00
parent 456d901747
commit 20f62b5b10
10 changed files with 18 additions and 21 deletions

6
.gitmodules vendored
View File

@@ -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

Submodule PSWGCommon deleted from 0e8213d64f

View File

@@ -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"
}

1
pswgcommon Submodule

Submodule pswgcommon added at e2532b34ed

View File

@@ -1 +1 @@
include 'PSWGCommon'
include 'pswgcommon'

View File

@@ -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;

View File

@@ -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);
}
}

View File

@@ -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;

View File

@@ -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 {

View File

@@ -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 {