From b729bc5f237d13d0791b704da16ee1a6946a3a7d Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Wed, 1 Jan 2025 21:52:08 -0800
Subject: [PATCH] Update Gradle wrapper and dependencies

---
 gradle/build-logic/src/main/kotlin/CopyFile.kt | 2 +-
 gradle/libs.versions.toml                      | 6 +++---
 gradle/wrapper/gradle-wrapper.properties       | 2 +-
 gradlew                                        | 3 +--
 neoforge/build.gradle.kts                      | 4 +++-
 settings.gradle.kts                            | 2 +-
 sponge/build.gradle.kts                        | 4 +++-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/gradle/build-logic/src/main/kotlin/CopyFile.kt b/gradle/build-logic/src/main/kotlin/CopyFile.kt
index ee15e517..be39ddb2 100644
--- a/gradle/build-logic/src/main/kotlin/CopyFile.kt
+++ b/gradle/build-logic/src/main/kotlin/CopyFile.kt
@@ -12,7 +12,7 @@ abstract class CopyFile : DefaultTask() {
   abstract val destination: RegularFileProperty
 
   @TaskAction
-  private fun copyFile() {
+  fun copyFile() {
     destination.get().asFile.parentFile.mkdirs()
     fileToCopy.get().asFile.copyTo(destination.get().asFile, overwrite = true)
   }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5c9f16e6..70e37783 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,12 +22,12 @@ guava = "21.0"
 bstats = "3.1.0"
 paperApi = "1.16.5-R0.1-SNAPSHOT"
 paperLib = "1.0.8"
-fabricApi = "0.112.2+1.21.4"
+fabricApi = "0.114.0+1.21.4"
 fabricLoader = "0.16.9"
 minecraft = "1.21.4"
-adventurePlatformMod = "6.1.0"
+adventurePlatformMod = "6.2.0"
 mixin = "0.8.7"
-neoforge = "21.4.33-beta"
+neoforge = "21.4.47-beta"
 neoForm = "1.21.4-20241203.161809"
 
 # buildSrc
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e2847c82..cea7a793 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d..f3b75f3b 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
index 35e3f97f..95845426 100644
--- a/neoforge/build.gradle.kts
+++ b/neoforge/build.gradle.kts
@@ -8,7 +8,9 @@ plugins {
 val minecraftVersion = libs.versions.minecraft.get()
 
 neoForge {
-  version = libs.versions.neoforge
+  enable {
+    version = libs.versions.neoforge.get()
+  }
 
   mods {
     register("tabtps") {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 52fa6baa..d8e5c356 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -35,7 +35,7 @@ pluginManagement {
 plugins {
   id("quiet-fabric-loom") version "1.9-SNAPSHOT"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
-  id("net.neoforged.moddev.repositories") version "2.0.61-beta"
+  id("net.neoforged.moddev.repositories") version "2.0.71"
 }
 
 rootProject.name = "TabTPS"
diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts
index 9831f78a..ca14a835 100644
--- a/sponge/build.gradle.kts
+++ b/sponge/build.gradle.kts
@@ -54,7 +54,9 @@ sponge {
 }
 
 neoForge {
-  neoFormVersion = libs.versions.neoForm
+  enable {
+    neoFormVersion = libs.versions.neoForm.get()
+  }
 }
 
 tasks {