Skip to content

Commit 5c5edc8

Browse files
skbehskbeh
committed
Update gradle to 8.x
1 parent e18edb5 commit 5c5edc8

12 files changed

Lines changed: 344 additions & 252 deletions

File tree

‎build.gradle‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
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 'java'
3+
id 'maven-publish'
104
}
115

126
allprojects {
@@ -15,13 +9,8 @@ allprojects {
159
}
1610

1711
subprojects {
18-
apply plugin: 'java'
19-
apply plugin: 'java-library'
20-
apply plugin: 'com.github.johnrengelman.shadow'
21-
apply plugin: 'maven-publish'
22-
23-
sourceCompatibility = 1.8
24-
targetCompatibility = 1.8
12+
sourceCompatibility = JavaVersion.VERSION_1_8
13+
targetCompatibility = JavaVersion.VERSION_1_8
2514

2615
repositories {
2716
mavenCentral()
@@ -61,8 +50,13 @@ subprojects {
6150
url 'https://repo.essentialsx.net/releases/'
6251
}
6352

53+
maven {
54+
name 'sirblobman-repo'
55+
url 'https://nexus.sirblobman.xyz/public/'
56+
}
57+
6458
flatDir {
6559
dirs "$rootDir/libs/"
6660
}
6761
}
68-
}
62+
}

‎duels-api/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
plugins {
2+
id 'java'
3+
id 'maven-publish'
4+
}
5+
16
dependencies {
27
compileOnly 'org.jetbrains:annotations-java5:22.0.0'
3-
implementation 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
8+
compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
49
}
510

611
publishing {
@@ -12,4 +17,4 @@ publishing {
1217
from components.java
1318
}
1419
}
15-
}
20+
}

‎duels-plugin/build.gradle‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import org.apache.tools.ant.filters.ReplaceTokens
22

3+
plugins {
4+
id 'java'
5+
id 'maven-publish'
6+
id 'com.github.johnrengelman.shadow' version '8.1.1'
7+
}
8+
39
clean.doFirst {
410
delete "$rootDir/out/"
511
}
@@ -14,35 +20,36 @@ processResources {
1420
}
1521

1622
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') {
23+
compileOnly 'org.jetbrains:annotations:24.0.1'
24+
compileOnly 'org.projectlombok:lombok:1.18.26'
25+
annotationProcessor 'org.projectlombok:lombok:1.18.26'
26+
compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
27+
compileOnly 'com.mojang:authlib:1.5.21'
28+
compileOnly 'me.clip:placeholderapi:2.11.1'
29+
compileOnly 'com.github.sirblobman.api:core:2.7-SNAPSHOT'
30+
compileOnly 'com.github.sirblobman.combatlogx:api:11.2-SNAPSHOT'
31+
compileOnly ('net.essentialsx:EssentialsX:2.19.7') {
2532
transitive = false
2633
}
27-
implementation (name: 'MVdWPlaceholderAPI-3.1.1') {
34+
compileOnly (name: 'MVdWPlaceholderAPI-3.1.1') {
2835
transitive = false
2936
}
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'
37+
compileOnly name: 'Vault-1.6.7'
38+
compileOnly name: 'CombatTagPlus'
39+
compileOnly name: 'PvPManager-3.7.16'
40+
compileOnly name: 'Factions-1.6.9.5-U0.1.14'
41+
compileOnly name: 'MassiveCore'
42+
compileOnly name: 'Factions'
43+
compileOnly name: 'MyPet-2.3.4'
44+
compileOnly name: 'BountyHunters-2.2.6'
45+
compileOnly name: 'SimpleClans-2.14.4.1'
46+
compileOnly name: 'LeaderHeadsAPI'
4047

4148
implementation project(':duels-api')
4249
implementation project(':duels-worldguard')
4350
implementation project(':duels-worldguard-v6')
4451
implementation project(':duels-worldguard-v7')
45-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
52+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.0'
4653
}
4754

4855
shadowJar {
@@ -77,4 +84,4 @@ publishing {
7784
from components.java
7885
}
7986
}
80-
}
87+
}

‎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

‎duels-worldguard-v6/build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
plugins {
2+
id 'java'
3+
}
4+
15
dependencies {
2-
implementation ('com.sk89q:worldguard:6.1.1-SNAPSHOT') {
6+
compileOnly ('com.sk89q:worldguard:6.1.1-SNAPSHOT') {
37
exclude group: 'org.bukkit', module: 'bukkit'
48
}
59
implementation project(':duels-worldguard')
6-
}
10+
}

‎duels-worldguard-v7/build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
plugins {
2+
id 'java'
3+
}
4+
15
dependencies {
2-
implementation ('com.sk89q.worldguard:worldguard-bukkit:7.0.0') {
6+
compileOnly ('com.sk89q.worldguard:worldguard-bukkit:7.0.0') {
37
exclude group: 'org.bukkit', module: 'bukkit'
48
}
59
implementation project(':duels-worldguard')
6-
}
10+
}

‎duels-worldguard/build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
plugins {
2+
id 'java'
3+
}
4+
15
dependencies {
2-
api 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
3-
}
6+
compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
7+
}

‎gradle/wrapper/gradle-wrapper.jar‎

7.2 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

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.1.1-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)