Skip to content

Commit 9b30afe

Browse files
committed
Update gradle to 8.x
1 parent e18edb5 commit 9b30afe

7 files changed

Lines changed: 306 additions & 234 deletions

File tree

build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
buildscript {
2-
repositories {
3-
mavenCentral()
4-
gradlePluginPortal()
5-
}
6-
7-
dependencies {
8-
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
9-
}
1+
plugins {
2+
id 'com.github.johnrengelman.shadow' version '8.1.1'
103
}
114

125
allprojects {
@@ -15,7 +8,6 @@ allprojects {
158
}
169

1710
subprojects {
18-
apply plugin: 'java'
1911
apply plugin: 'java-library'
2012
apply plugin: 'com.github.johnrengelman.shadow'
2113
apply plugin: 'maven-publish'
@@ -61,6 +53,11 @@ subprojects {
6153
url 'https://repo.essentialsx.net/releases/'
6254
}
6355

56+
maven {
57+
name 'sirblobman-repo'
58+
url 'https://nexus.sirblobman.xyz/public/'
59+
}
60+
6461
flatDir {
6562
dirs "$rootDir/libs/"
6663
}

duels-plugin/build.gradle

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,36 @@ processResources {
1414
}
1515

1616
dependencies {
17-
compileOnly 'org.jetbrains:annotations-java5:22.0.0'
18-
compileOnly 'org.projectlombok:lombok:1.18.22'
19-
annotationProcessor 'org.projectlombok:lombok:1.18.22'
20-
implementation 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
21-
implementation 'com.mojang:authlib:1.5.21'
22-
implementation 'me.clip:placeholderapi:2.11.1'
23-
implementation 'com.SirBlobman.combatlogx:CombatLogX-API:10.0.0.0-SNAPSHOT'
24-
implementation ('net.essentialsx:EssentialsX:2.19.2') {
17+
compileOnly 'org.jetbrains:annotations:24.0.1'
18+
compileOnly 'org.projectlombok:lombok:1.18.26'
19+
annotationProcessor 'org.projectlombok:lombok:1.18.26'
20+
compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
21+
compileOnly 'com.mojang:authlib:1.5.25'
22+
compileOnly 'me.clip:placeholderapi:2.11.1'
23+
compileOnly 'com.github.sirblobman.api:core:2.7-SNAPSHOT'
24+
compileOnly 'com.github.sirblobman.combatlogx:api:11.2-SNAPSHOT'
25+
compileOnly ('net.essentialsx:EssentialsX:2.19.7') {
2526
transitive = false
2627
}
27-
implementation (name: 'MVdWPlaceholderAPI-3.1.1') {
28+
compileOnly (name: 'MVdWPlaceholderAPI-3.1.1') {
2829
transitive = false
2930
}
30-
implementation name: 'Vault-1.6.7'
31-
implementation name: 'CombatTagPlus'
32-
implementation name: 'PvPManager-3.7.16'
33-
implementation name: 'Factions-1.6.9.5-U0.1.14'
34-
implementation name: 'MassiveCore'
35-
implementation name: 'Factions'
36-
implementation name: 'MyPet-2.3.4'
37-
implementation name: 'BountyHunters-2.2.6'
38-
implementation name: 'SimpleClans-2.14.4.1'
39-
implementation name: 'LeaderHeadsAPI'
31+
compileOnly name: 'Vault-1.6.7'
32+
compileOnly name: 'CombatTagPlus'
33+
compileOnly name: 'PvPManager-3.7.16'
34+
compileOnly name: 'Factions-1.6.9.5-U0.1.14'
35+
compileOnly name: 'MassiveCore'
36+
compileOnly name: 'Factions'
37+
compileOnly name: 'MyPet-2.3.4'
38+
compileOnly name: 'BountyHunters-2.2.6'
39+
compileOnly name: 'SimpleClans-2.14.4.1'
40+
compileOnly name: 'LeaderHeadsAPI'
4041

4142
implementation project(':duels-api')
4243
implementation project(':duels-worldguard')
4344
implementation project(':duels-worldguard-v6')
4445
implementation project(':duels-worldguard-v7')
45-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
46+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
4647
}
4748

4849
shadowJar {

duels-plugin/src/main/java/me/realized/duels/hook/hooks/CombatLogXHook.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.realized.duels.hook.hooks;
22

3-
import com.SirBlobman.combatlogx.api.ICombatLogX;
4-
import com.SirBlobman.combatlogx.api.event.PlayerPreTagEvent;
3+
import com.github.sirblobman.combatlogx.api.ICombatLogX;
4+
import com.github.sirblobman.combatlogx.api.event.PlayerPreTagEvent;
55
import me.realized.duels.DuelsPlugin;
66
import me.realized.duels.arena.ArenaManagerImpl;
77
import me.realized.duels.config.Config;
@@ -23,12 +23,6 @@ public CombatLogXHook(final DuelsPlugin plugin) {
2323
this.config = plugin.getConfiguration();
2424
this.arenaManager = plugin.getArenaManager();
2525

26-
try {
27-
Class.forName("com.SirBlobman.combatlogx.api.event.PlayerPreTagEvent");
28-
} catch (ClassNotFoundException ex) {
29-
throw new RuntimeException("This version of " + getName() + " is not supported. Please try upgrading to the latest version.");
30-
}
31-
3226
Bukkit.getPluginManager().registerEvents(new CombatLogXListener(), plugin);
3327
}
3428

gradle/wrapper/gradle-wrapper.jar

6.74 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Dec 25 01:36:54 KST 2021
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

0 commit comments

Comments
 (0)