feat: adjust to build with java 16

xCykrix · Aug 16, 2024 · 2f0edee · 2f0edee
1 parent 0cb8188
commit 2f0edee
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 26 deletions.
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '22'
           distribution: 'adopt'
           architecture: x64
       - name: Setup Gradle

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules/DynamicLights.main.iml b/.idea/modules/DynamicLights.main.iml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
     id("io.github.goooler.shadow") version "8.1.8"
     id("java")
@@ -35,11 +37,16 @@ repositories {
 
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
-    implementation("github.xCykrix:spigotdevkit:1.0.1")
+    implementation("github.xCykrix:spigotdevkit:1.0.3")
+}
+
+// Shadow Task
+tasks.named<ShadowJar>("shadowJar") {
+    archiveClassifier = null;
 }
 
-// Target Java Build (Java 17 - Minecraft 1.17.x)
-val targetJavaVersion = 17
+// Target Java Build (Java 16 - Minecraft 1.17.x)
+val targetJavaVersion = 16
 java {
     val javaVersion = JavaVersion.toVersion(targetJavaVersion)
     sourceCompatibility = javaVersion

diff --git a/src/main/java/github/xCykrix/dynamicLights/command/BaseCommand.java b/src/main/java/github/xCykrix/dynamicLights/command/BaseCommand.java
@@ -1,11 +1,11 @@
 package github.xCykrix.dynamicLights.command;
 
+import dist.xCykrix.shade.dev.jorel.commandapi.CommandAPICommand;
+import dist.xCykrix.shade.org.apache.commons.lang3.exception.ExceptionUtils;
 import github.xCykrix.DevkitPlugin;
 import github.xCykrix.dynamicLights.DynamicLights;
 import github.xCykrix.extendable.DevkitSimpleState;
 import github.xCykrix.plugin.CommandPlugin;
-import github.xCykrix.shade.dev.jorel.commandapi.CommandAPICommand;
-import github.xCykrix.shade.org.apache.commons.lang3.exception.ExceptionUtils;
 import java.io.IOException;
 import java.util.Objects;
 

diff --git a/src/main/java/github/xCykrix/dynamicLights/util/LightManager.java b/src/main/java/github/xCykrix/dynamicLights/util/LightManager.java
@@ -3,8 +3,8 @@
 import github.xCykrix.DevkitPlugin;
 import github.xCykrix.dynamicLights.DynamicLights;
 import github.xCykrix.extendable.DevkitFullState;
-import github.xCykrix.shade.dev.dejvokep.boostedyaml.YamlDocument;
-import github.xCykrix.shade.org.h2.mvstore.MVMap;
+import dist.xCykrix.shade.dev.dejvokep.boostedyaml.YamlDocument;
+import dist.xCykrix.shade.org.h2.mvstore.MVMap;
 import java.util.HashMap;
 import java.util.UUID;
 import org.bukkit.Bukkit;

diff --git a/src/main/java/github/xCykrix/dynamicLights/util/LightSource.java b/src/main/java/github/xCykrix/dynamicLights/util/LightSource.java
@@ -3,8 +3,8 @@
 import github.xCykrix.DevkitPlugin;
 import github.xCykrix.dynamicLights.DynamicLights;
 import github.xCykrix.extendable.DevkitFullState;
-import github.xCykrix.shade.dev.dejvokep.boostedyaml.YamlDocument;
-import github.xCykrix.shade.dev.dejvokep.boostedyaml.block.Block;
+import dist.xCykrix.shade.dev.dejvokep.boostedyaml.YamlDocument;
+import dist.xCykrix.shade.dev.dejvokep.boostedyaml.block.Block;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -2,7 +2,7 @@ name: 'DynamicLights'
 description: 'Emit Light from Held Items using the 1.17 Light Blocks.'
 website: 'https://www.spigotmc.org/resources/dynamiclights.110707/'
 author: 'xCykrix'
-version: '1.0-SNAPSHOT'
+version: '1.1.0'
 
 main: github.xCykrix.dynamicLights.DynamicLights
 api-version: '1.17'