From dcf7d2b0a578967222703874fcf1344a858dd816 Mon Sep 17 00:00:00 2001
From: unurled <unurled@unurled.me>
Date: Mon, 29 Apr 2024 21:49:07 +0200
Subject: [PATCH] bump to 1.20.5 + no support for spigot

---
 build.gradle.kts                         | 14 +++++++-------
 gradle/wrapper/gradle-wrapper.properties |  5 ++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index fc75eec..8f59332 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,19 +1,23 @@
 plugins {
     `java-library`
-    id("io.papermc.paperweight.userdev") version "1.5.11"
+    id("io.papermc.paperweight.userdev") version "1.6.2"
     id("io.github.goooler.shadow") version "8.1.7"
     id("org.sonarqube") version "4.4.1.3373"
 }
 
+// from 1.20.5+ upward, spigot is not supported
+paperweight.reobfArtifactConfiguration =
+    io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
+
 group = "me.unurled.sacredrealms"
 version = "0.1.0"
 description = "The main SR plugin."
 
-val mcVersion = "1.20.4-R0.1-SNAPSHOT"
+val mcVersion = "1.20.5-R0.1-SNAPSHOT"
 val redisVersion = "5.2.0-beta1"
 val invuiVersion = "1.26"
 
-val javaVersion = 22
+val javaVersion = 21
 
 repositories {
     mavenCentral()
@@ -33,10 +37,6 @@ java {
 }
 
 tasks {
-    assemble {
-        dependsOn(reobfJar)
-    }
-
     compileJava {
         options.encoding = Charsets.UTF_8.name()
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23..505e9e8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
+#Mon Apr 29 21:41:32 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists