From 0f5d81e7f88db0e4dbd369bc0029291d609d225b Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Tue, 3 Sep 2024 17:08:48 -0700
Subject: [PATCH] Update shadow, moddevgradle, renovate.json

---
 .../build-logic/src/main/kotlin/tabtps.platform.gradle.kts   | 2 +-
 gradle/libs.versions.toml                                    | 4 ++--
 renovate.json                                                | 5 +++++
 settings.gradle.kts                                          | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gradle/build-logic/src/main/kotlin/tabtps.platform.gradle.kts b/gradle/build-logic/src/main/kotlin/tabtps.platform.gradle.kts
index 2e43ac82..ccc4fdf1 100644
--- a/gradle/build-logic/src/main/kotlin/tabtps.platform.gradle.kts
+++ b/gradle/build-logic/src/main/kotlin/tabtps.platform.gradle.kts
@@ -2,7 +2,7 @@ import me.modmuss50.mpp.ReleaseType
 
 plugins {
   id("tabtps.base")
-  id("io.github.goooler.shadow")
+  id("com.gradleup.shadow")
   id("me.modmuss50.mod-publish-plugin")
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 703482c5..c22db51d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ neoforge = "21.1.26"
 
 # buildSrc
 indra = "3.1.3"
-shadow = "8.1.8"
+shadow = "8.3.0"
 mod-publish-plugin = "0.7.2"
 hangarPublishPlugin = "0.1.2"
 
@@ -87,7 +87,7 @@ zNeoforge = { module = "net.neoforged:neoforge", version.ref = "neoforge" }
 # buildSrc
 build-indraCommon = { group = "net.kyori", name = "indra-common", version.ref = "indra" }
 build-indraLicenser = { group = "net.kyori", name = "indra-licenser-spotless", version.ref = "indra" }
-build-shadow = { module = "io.github.goooler.shadow:shadow-gradle-plugin", version.ref = "shadow" }
+build-shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadow" }
 build-mod-publish-plugin = { module = "me.modmuss50:mod-publish-plugin", version.ref = "mod-publish-plugin" }
 build-hangarPublishPlugin = { group = "io.papermc", name = "hangar-publish-plugin", version.ref = "hangarPublishPlugin" }
 
diff --git a/renovate.json b/renovate.json
index e5a330b5..8eb2362f 100644
--- a/renovate.json
+++ b/renovate.json
@@ -23,6 +23,11 @@
       "matchPackageNames": ["net.fabricmc.fabric-api:fabric-api", "net.fabricmc.fabric-api:fabric-api-deprecated"],
       "versioning": "regex:^(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(?:\\+(?<compatibility>.*))?$"
     },
+    {
+      "description": "Correct NeoForge version handling",
+      "matchPackageNames": ["net.neoforged:neoforge"],
+      "versioning": "regex:^(?<compatibility>(\\d+\\.){2})(?<minor>\\d+)(-beta)?$"
+    },
     {
       "matchManagers": ["github-actions", "gradle-wrapper"],
       "groupName": "gradle and github actions"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bb9556bd..bc21a3ca 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -37,7 +37,7 @@ plugins {
   id("quiet-fabric-loom") version "1.7-SNAPSHOT"
   id("org.spongepowered.gradle.vanilla") version "0.2.1-SNAPSHOT"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-  id("net.neoforged.moddev.repositories") version "2.0.18-beta"
+  id("net.neoforged.moddev.repositories") version "2.0.26-beta"
 }
 
 rootProject.name = "TabTPS"