diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 28c5911..53991b9 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -8,6 +8,6 @@ repositories { tasks { compileKotlin { - kotlinOptions.jvmTarget = "8" + kotlinOptions.jvmTarget = "1.8" } } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/project.common-conventions.gradle.kts b/buildSrc/src/main/kotlin/project.common-conventions.gradle.kts index d0d022c..51b1911 100644 --- a/buildSrc/src/main/kotlin/project.common-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/project.common-conventions.gradle.kts @@ -7,6 +7,7 @@ plugins { repositories { mavenLocal() maven("https://repo.papermc.io/repository/maven-public/") + maven("https://plugins.gradle.org/m2/") mavenCentral() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b0875fe..2b331b8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] spigot = "1.16.5-R0.1-SNAPSHOT" -placeholder = "2.11.1" +placeholder = "2.11.5" [libraries] spigot = { group = "com.destroystokyo.paper", name = "paper-api", version.ref = "spigot" } @@ -9,4 +9,4 @@ spigot = { group = "com.destroystokyo.paper", name = "paper-api", version.ref = placeholder = { group = "me.clip", name = "placeholderapi", version.ref = "placeholder" } [plugins] -shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2"} \ No newline at end of file +shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1"} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00e33ed..e819475 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 76f46f5..97de6ab 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -9,6 +9,8 @@ repositories { maven("https://repo.alessiodp.com/releases/") maven("https://nexus.neetgames.com/repository/maven-releases/") maven("https://jitpack.io/") + maven("https://repo.papermc.io/repository/maven-public/") + maven("https://plugins.gradle.org/m2/") mavenCentral() } @@ -18,20 +20,20 @@ dependencies { compileOnly(libs.spigot) compileOnly(libs.placeholder) - compileOnly("net.kyori:adventure-text-minimessage:4.14.0") - compileOnly("net.kyori:adventure-text-serializer-gson:4.14.0") - compileOnly("net.kyori:adventure-text-serializer-legacy:4.14.0") - implementation("com.github.BlueSlimeDev:NMSHandlerAPI:0.4") - implementation("net.byteflux:libby-bukkit:1.1.5") + compileOnly("net.kyori:adventure-text-minimessage:4.17.0-SNAPSHOT") + compileOnly("net.kyori:adventure-text-serializer-gson:4.17.0-SNAPSHOT") + compileOnly("net.kyori:adventure-text-serializer-legacy:4.17.0-SNAPSHOT") + implementation("com.github.BlueSlimeDev:NMSHandlerAPI:0.5.0") + implementation("com.alessiodp.libby:libby-bukkit:2.0.0-SNAPSHOT") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2") testRuntimeOnly(libs.spigot) - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2") } tasks { shadowJar { - relocate("net.byteflux.libby", "com.xism4.sternalboard.libs") + relocate("com.alessiodp.libby", "com.xism4.sternalboard.libs") relocate("net.kyori", "com.xism4.sternalboard.libs.kyori") relocate("me.blueslime", "com.xism4.sternalboard.libs.blueslime") archiveBaseName.set("SternalBoard") diff --git a/plugin/src/main/java/com/xism4/sternalboard/managers/library/LibraryManager.java b/plugin/src/main/java/com/xism4/sternalboard/managers/library/LibraryManager.java index c6e59a3..0c6ff7e 100644 --- a/plugin/src/main/java/com/xism4/sternalboard/managers/library/LibraryManager.java +++ b/plugin/src/main/java/com/xism4/sternalboard/managers/library/LibraryManager.java @@ -1,8 +1,8 @@ package com.xism4.sternalboard.managers.library; import com.xism4.sternalboard.SternalBoardPlugin; -import net.byteflux.libby.BukkitLibraryManager; -import net.byteflux.libby.Library; +import com.alessiodp.libby.BukkitLibraryManager; +import com.alessiodp.libby.Library; import java.util.ArrayList; @@ -10,7 +10,7 @@ public class LibraryManager { public static ArrayList libs = new ArrayList<>(); - public static String ADVENTURE_VERSION = "4.14.0"; + public static String ADVENTURE_VERSION = "4.17.0-SNAPSHOT"; public static ArrayList getLibs() { return libs; @@ -36,7 +36,7 @@ public static void load(){ Library adventureBukkitPlatform = Library.builder() .groupId("net{}kyori") .artifactId("adventure-platform-bukkit") - .version("4.3.0") + .version("4.3.3-SNAPSHOT") .isolatedLoad(false) .relocate("net{}kyori", "com{}xism4{}sternalboard{}libs{}kyori") .build(); @@ -44,7 +44,7 @@ public static void load(){ Library examination = Library.builder() .groupId("net{}kyori") .artifactId("examination-api") - .version("1.3.0") + .version("1.3.1-SNAPSHOT") .isolatedLoad(false) .relocate("net{}kyori", "com{}xism4{}sternalboard{}libs{}kyori") .build(); @@ -52,7 +52,7 @@ public static void load(){ Library adventurePlatformApi = Library.builder() .groupId("net{}kyori") .artifactId("adventure-platform-api") - .version("4.3.0") + .version("4.3.3-SNAPSHOT") .isolatedLoad(false) .relocate("net{}kyori", "com{}xism4{}sternalboard{}libs{}kyori") .build(); @@ -60,7 +60,7 @@ public static void load(){ Library adventurePlatformFacet = Library.builder() .groupId("net{}kyori") .artifactId("adventure-platform-facet") - .version("4.3.0") + .version("4.3.3-SNAPSHOT") .isolatedLoad(false) .relocate("net{}kyori", "com{}xism4{}sternalboard{}libs{}kyori") .build(); @@ -158,6 +158,7 @@ public static void loadLibs(SternalBoardPlugin plugin) { manager.addJitPack(); manager.addSonatype(); manager.addRepository("https://jitpack.io"); + manager.addRepository("https://s01.oss.sonatype.org/content/repositories/snapshots/"); LibraryManager.load(); LibraryManager.getLibs().forEach(manager::loadLibrary); diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml index cc53727..ce1fa0c 100644 --- a/plugin/src/main/resources/config.yml +++ b/plugin/src/main/resources/config.yml @@ -1,7 +1,7 @@ # # SternalBoard - Scoreboard plugin for Spigot and paper servers # -# Version: 2.2.8 +# Version: 2.2.9 # Author: xism4 # # Support discord: https://discord.com/invite/jmWk4pR2SG