diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9acb6cb..f556444 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,17 +7,10 @@
"features": {
"ghcr.io/devcontainers/features/java:1": {
- "version": "none",
- "installMaven": "false",
- "installGradle": "false"
- }
- },
- "customizations": {
- "vscode": {
- "extensions": [
- "redhat.java",
- "redhat.vscode-xml"
- ]
+ "version": "21",
+ "installMaven": "true",
+ "installGradle": "false",
+ "mavenVersion": "3.9.10"
}
}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..457f3c5
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,6 @@
+{
+ "recommendations": [
+ "vscjava.vscode-java-pack",
+ "redhat.vscode-xml"
+ ]
+}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index eab3cbe..431a073 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,15 +1,6 @@
{
"version": "2.0.0",
"tasks": [
- {
- "type": "java (buildArtifact)",
- "targetPath": "${workspaceFolder}/devserver/plugins/${workspaceFolderBasename}.jar",
- "elements": [
- "${compileOutput}",
- "${dependencies}"
- ],
- "problemMatcher": [],
- "label": "Build SpigotResourceSync to plugins"
- }
+
]
}
\ No newline at end of file
diff --git a/devserver/loadplugin.sh b/devserver/loadplugin.sh
old mode 100644
new mode 100755
diff --git a/pom.xml b/pom.xml
index 140d40d..d50e656 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,34 @@
systems.reslate.entertainment.spigotresourcesync
spigotresourcesync
- 1.0-SNAPSHOT
+ 1.0.1-SNAPSHOT
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.6.0
+
+
+
+ org.junit.jupiter:junit-jupiter-engine
+ org.apache.maven:lib:tests
+ org.spigotmc:spigot-api
+
+
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
21
@@ -24,7 +51,7 @@
org.spigotmc
spigot-api
- 1.20.4-R0.1-SNAPSHOT
+ 1.21.4-R0.1-SNAPSHOT
provided
@@ -35,17 +62,12 @@
com.fasterxml.jackson.dataformat
jackson-dataformat-yaml
- 2.18.0
-
-
- com.fasterxml.jackson.datatype
- jackson-datatype-jsr310
- 2.18.0
+ 2.19.2
com.fasterxml.jackson.core
jackson-core
- 2.18.0
+ 2.19.2
org.junit.jupiter
diff --git a/src/main/java/solutions/reslate/entertainment/spigotresourcesync/synchronisation/ApacheCommonsIOSynchroniser.java b/src/main/java/solutions/reslate/entertainment/spigotresourcesync/synchronisation/ApacheCommonsIOSynchroniser.java
index 36f0d62..87af492 100644
--- a/src/main/java/solutions/reslate/entertainment/spigotresourcesync/synchronisation/ApacheCommonsIOSynchroniser.java
+++ b/src/main/java/solutions/reslate/entertainment/spigotresourcesync/synchronisation/ApacheCommonsIOSynchroniser.java
@@ -19,7 +19,7 @@ public class ApacheCommonsIOSynchroniser implements Synchroniser {
if (dest.isDirectory()) {
FileUtils.copyDirectory(source, dest);
} else {
- throw new IOException("Cannot synchronise directy to non-directory!");
+ throw new IOException("Cannot synchronise directory to non-directory!");
// TODO add more detail to error message.
}
} else {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 5f182e2..a57764b 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,3 +1,3 @@
name: SpigotResourceSync
-version: 1.0.0
+version: 1.0.1
main: solutions.reslate.entertainment.spigotresourcesync.SpigotResourceSync
\ No newline at end of file
diff --git a/src/test/java/solutions/reslate/entertainment/spigotresourcesync/TestConfigManager.java b/src/test/java/solutions/reslate/entertainment/spigotresourcesync/TestConfigManager.java
index 8ff6163..4259926 100644
--- a/src/test/java/solutions/reslate/entertainment/spigotresourcesync/TestConfigManager.java
+++ b/src/test/java/solutions/reslate/entertainment/spigotresourcesync/TestConfigManager.java
@@ -27,6 +27,6 @@ public class TestConfigManager {
assumeTrue(dummyConfig.exists());
ConfigManager finalConfigManager = new ConfigManager(dummyConfig, dummySerialiser, logger);
finalConfigManager.load();
- assertEquals(dummySyncPair, finalConfigManager.getConfiguration().getSyncList().gatherAllSyncPairs().get(0));
+ assertEquals(dummySyncPair, finalConfigManager.getConfiguration().getSyncList().gatherAllSyncPairs().get(1));
}
}