diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8223601..f556444 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,19 +7,10 @@ "features": { "ghcr.io/devcontainers/features/java:1": { - "version": "none", + "version": "21", "installMaven": "true", - "installGradle": "false" - } - }, - "customizations": { - "vscode": { - "extensions": [ - "redhat.java", - "redhat.vscode-xml", - "piotrpalarz.vscode-gitignore-generator", - "Gruntfuggly.todo-tree" - ] + "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/devserver/loadplugin.sh b/devserver/loadplugin.sh old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml index cff9c6a..ded83d7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,61 +6,32 @@ systems.reslate.entertainment.spigotresourcesync spigotresourcesync - 1.0-SNAPSHOT + 1.0.1-SNAPSHOT - - 21 - 21 - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - - - org.spigotmc - spigot-api - 1.20.4-R0.1-SNAPSHOT - provided - - - commons-io - commons-io - 2.17.0 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - 2.18.0 - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.18.0 - - - com.fasterxml.jackson.core - jackson-core - 2.18.0 - - - org.hive2hive - org.hive2hive.core - 1.2.4 - - - org.junit.jupiter - junit-jupiter-engine - 5.11.0-M2 - test - - + + 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 + + + + org.apache.maven.plugins maven-surefire-plugin @@ -92,4 +63,51 @@ + + + 21 + 21 + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + + org.spigotmc + spigot-api + 1.21.4-R0.1-SNAPSHOT + provided + + + commons-io + commons-io + 2.17.0 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.19.2 + + + com.fasterxml.jackson.core + jackson-core + 2.19.2 + + + org.hive2hive + org.hive2hive.core + 1.2.4 + + + org.junit.jupiter + junit-jupiter-engine + 5.11.0-M2 + test + + \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 2aad423..fd7d5a0 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -6,4 +6,4 @@ api-version: '1.20' commands: spigotresourcesync: description: Tool suite for synchronisation resources across directories. - usage: See "/spigotresourcesync help" for help. \ No newline at end of file + usage: See "/spigotresourcesync help" for help. diff --git a/src/test/java/solutions/reslate/entertainment/spigotresourcesync/TestConfigManager.java b/src/test/java/solutions/reslate/entertainment/spigotresourcesync/TestConfigManager.java index dfb6e55..d169c93 100644 --- a/src/test/java/solutions/reslate/entertainment/spigotresourcesync/TestConfigManager.java +++ b/src/test/java/solutions/reslate/entertainment/spigotresourcesync/TestConfigManager.java @@ -28,6 +28,6 @@ public class TestConfigManager { assumeTrue(dummyConfig.exists()); ConfigManager finalConfigManager = new ConfigManager(dummyConfig, dummySerialiser, logger); finalConfigManager.load(); - assertEquals(dummySyncPair, new ArrayList<>(finalConfigManager.getConfiguration().getSyncList().gatherAllSyncPairs()).get(1)); + assertEquals(dummySyncPair, finalConfigManager.getConfiguration().getSyncList().gatherAllSyncPairs().getLast()); } }