From 981d9a095db9c53222493b23f6467c0875294868 Mon Sep 17 00:00:00 2001
From: coolGi <sasanaps@hotmail.com>
Date: Fri, 24 Feb 2023 19:08:53 +1030
Subject: [PATCH] Removed classifier's as they are no longer needed in gradle
 18

---
 fabric/build.gradle                      | 14 +++-----------
 forge/build.gradle                       |  4 ----
 gradle/wrapper/gradle-wrapper.properties |  1 +
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/fabric/build.gradle b/fabric/build.gradle
index fda3e0485..118d593fb 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -134,17 +134,9 @@ shadowJar {
     // SVG
     relocate 'com.kitfox.svg', 'distanthorizons.libraries.kitfox.svg'
 
-    classifier "dev-shadow"
     mergeServiceFiles()
 }
 
-remapJar {
-    // FIXME: AccessWidener
-//    injectAccessWidener = true
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-    classifier null
-}
 
 task deleteResources(type: Delete) {
     delete file("build/resources/main")
@@ -162,9 +154,9 @@ runClient {
     finalizedBy(deleteResources)
 }
 
-jar {
-    classifier "dev"
-}
+//jar {
+//    classifier "dev"
+//}
 
 sourcesJar {
     def commonSources = project(":common").sourcesJar
diff --git a/forge/build.gradle b/forge/build.gradle
index 0e41d49e7..108ba1c99 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -159,7 +159,6 @@ shadowJar {
     // svg
     relocate "com.kitfox.svg", "distanthorizons.libraries.kitfox.svg"
 
-    classifier "dev-shadow"
     mergeServiceFiles()
 }
 
@@ -169,9 +168,6 @@ shadowJar {
 //    classifier null
 //}
 
-jar {
-    classifier "dev"
-}
 
 sourcesJar {
     def commonSources = project(":common").sourcesJar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 070cb702f..9502e869d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+# TODO: Wait for forge to fix gradle 8 support, once it did change gradle to a newer version
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists