Update gradle to 8.x

Realizedd · May 14, 2023 · 5c5edc8 · 5c5edc8
1 parent e18edb5
commit 5c5edc8
Show file tree

Hide file tree

Showing 12 changed files with 344 additions and 252 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,6 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-    }
-
-    dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
-    }
+plugins {
+    id 'java'
+    id 'maven-publish'
 }
 
 allprojects {
@@ -15,13 +9,8 @@ allprojects {
 }
 
 subprojects {
-    apply plugin: 'java'
-    apply plugin: 'java-library'
-    apply plugin: 'com.github.johnrengelman.shadow'
-    apply plugin: 'maven-publish'
-
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 
     repositories {
         mavenCentral()
@@ -61,8 +50,13 @@ subprojects {
             url 'https://repo.essentialsx.net/releases/'
         }
 
+        maven {
+            name 'sirblobman-repo'
+            url 'https://nexus.sirblobman.xyz/public/'
+        }
+
         flatDir {
             dirs "$rootDir/libs/"
         }
     }
-}
+}
diff --git a/duels-api/build.gradle b/duels-api/build.gradle
@@ -1,6 +1,11 @@
+plugins {
+    id 'java'
+    id 'maven-publish'
+}
+
 dependencies {
     compileOnly 'org.jetbrains:annotations-java5:22.0.0'
-    implementation 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
 }
 
 publishing {
@@ -12,4 +17,4 @@ publishing {
             from components.java
         }
     }
-}
+}
diff --git a/duels-plugin/build.gradle b/duels-plugin/build.gradle
@@ -1,5 +1,11 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+}
+
 clean.doFirst {
     delete "$rootDir/out/"
 }
@@ -14,35 +20,36 @@ processResources {
 }
 
 dependencies {
-    compileOnly 'org.jetbrains:annotations-java5:22.0.0'
-    compileOnly 'org.projectlombok:lombok:1.18.22'
-    annotationProcessor 'org.projectlombok:lombok:1.18.22'
-    implementation 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
-    implementation 'com.mojang:authlib:1.5.21'
-    implementation 'me.clip:placeholderapi:2.11.1'
-    implementation 'com.SirBlobman.combatlogx:CombatLogX-API:10.0.0.0-SNAPSHOT'
-    implementation ('net.essentialsx:EssentialsX:2.19.2') {
+    compileOnly 'org.jetbrains:annotations:24.0.1'
+    compileOnly 'org.projectlombok:lombok:1.18.26'
+    annotationProcessor 'org.projectlombok:lombok:1.18.26'
+    compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
+    compileOnly 'com.mojang:authlib:1.5.21'
+    compileOnly 'me.clip:placeholderapi:2.11.1'
+    compileOnly 'com.github.sirblobman.api:core:2.7-SNAPSHOT'
+    compileOnly 'com.github.sirblobman.combatlogx:api:11.2-SNAPSHOT'
+    compileOnly ('net.essentialsx:EssentialsX:2.19.7') {
         transitive = false
     }
-    implementation (name: 'MVdWPlaceholderAPI-3.1.1') {
+    compileOnly (name: 'MVdWPlaceholderAPI-3.1.1') {
         transitive = false
     }
-    implementation name: 'Vault-1.6.7'
-    implementation name: 'CombatTagPlus'
-    implementation name: 'PvPManager-3.7.16'
-    implementation name: 'Factions-1.6.9.5-U0.1.14'
-    implementation name: 'MassiveCore'
-    implementation name: 'Factions'
-    implementation name: 'MyPet-2.3.4'
-    implementation name: 'BountyHunters-2.2.6'
-    implementation name: 'SimpleClans-2.14.4.1'
-    implementation name: 'LeaderHeadsAPI'
+    compileOnly name: 'Vault-1.6.7'
+    compileOnly name: 'CombatTagPlus'
+    compileOnly name: 'PvPManager-3.7.16'
+    compileOnly name: 'Factions-1.6.9.5-U0.1.14'
+    compileOnly name: 'MassiveCore'
+    compileOnly name: 'Factions'
+    compileOnly name: 'MyPet-2.3.4'
+    compileOnly name: 'BountyHunters-2.2.6'
+    compileOnly name: 'SimpleClans-2.14.4.1'
+    compileOnly name: 'LeaderHeadsAPI'
 
     implementation project(':duels-api')
     implementation project(':duels-worldguard')
     implementation project(':duels-worldguard-v6')
     implementation project(':duels-worldguard-v7')
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.0'
 }
 
 shadowJar {
@@ -77,4 +84,4 @@ publishing {
             from components.java
         }
     }
-}
+}
diff --git a/duels-plugin/src/main/java/me/realized/duels/hook/hooks/CombatLogXHook.java b/duels-plugin/src/main/java/me/realized/duels/hook/hooks/CombatLogXHook.java
@@ -1,7 +1,7 @@
 package me.realized.duels.hook.hooks;
 
-import com.SirBlobman.combatlogx.api.ICombatLogX;
-import com.SirBlobman.combatlogx.api.event.PlayerPreTagEvent;
+import com.github.sirblobman.combatlogx.api.ICombatLogX;
+import com.github.sirblobman.combatlogx.api.event.PlayerPreTagEvent;
 import me.realized.duels.DuelsPlugin;
 import me.realized.duels.arena.ArenaManagerImpl;
 import me.realized.duels.config.Config;
@@ -23,12 +23,6 @@ public CombatLogXHook(final DuelsPlugin plugin) {
         this.config = plugin.getConfiguration();
         this.arenaManager = plugin.getArenaManager();
 
-        try {
-            Class.forName("com.SirBlobman.combatlogx.api.event.PlayerPreTagEvent");
-        } catch (ClassNotFoundException ex) {
-            throw new RuntimeException("This version of " + getName() + " is not supported. Please try upgrading to the latest version.");
-        }
-
         Bukkit.getPluginManager().registerEvents(new CombatLogXListener(), plugin);
     }
 

diff --git a/duels-worldguard-v6/build.gradle b/duels-worldguard-v6/build.gradle
@@ -1,6 +1,10 @@
+plugins {
+    id 'java'
+}
+
 dependencies {
-    implementation ('com.sk89q:worldguard:6.1.1-SNAPSHOT') {
+    compileOnly ('com.sk89q:worldguard:6.1.1-SNAPSHOT') {
         exclude group: 'org.bukkit', module: 'bukkit'
     }
     implementation project(':duels-worldguard')
-}
+}
diff --git a/duels-worldguard-v7/build.gradle b/duels-worldguard-v7/build.gradle
@@ -1,6 +1,10 @@
+plugins {
+    id 'java'
+}
+
 dependencies {
-    implementation ('com.sk89q.worldguard:worldguard-bukkit:7.0.0') {
+    compileOnly ('com.sk89q.worldguard:worldguard-bukkit:7.0.0') {
         exclude group: 'org.bukkit', module: 'bukkit'
     }
     implementation project(':duels-worldguard')
-}
+}
diff --git a/duels-worldguard/build.gradle b/duels-worldguard/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+    id 'java'
+}
+
 dependencies {
-    api 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
-}
+    compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Dec 25 01:36:54 KST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip