Skip to content

Commit

Permalink
Merge pull request #68 from Koekieezz/main
Browse files Browse the repository at this point in the history
Update Dependencies
  • Loading branch information
xism4 authored Apr 18, 2024
2 parents 9227f97 + 964b6fa commit 358e9a1
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 20 deletions.
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ repositories {

tasks {
compileKotlin {
kotlinOptions.jvmTarget = "8"
kotlinOptions.jvmTarget = "1.8"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugins {
repositories {
mavenLocal()
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://plugins.gradle.org/m2/")
mavenCentral()
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[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" }

placeholder = { group = "me.clip", name = "placeholderapi", version.ref = "placeholder" }

[plugins]
shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2"}
shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1"}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
18 changes: 10 additions & 8 deletions plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand All @@ -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")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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;

public class LibraryManager {

public static ArrayList<Library> libs = new ArrayList<>();

public static String ADVENTURE_VERSION = "4.14.0";
public static String ADVENTURE_VERSION = "4.17.0-SNAPSHOT";

public static ArrayList<Library> getLibs() {
return libs;
Expand All @@ -36,31 +36,31 @@ 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();

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();

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();

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();
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/resources/config.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 358e9a1

Please sign in to comment.