From 5567117cea151d32cef11cb5f01fd6293b2250af Mon Sep 17 00:00:00 2001
From: Krakenied <Krakenied1@gmail.com>
Date: Sun, 7 Jul 2024 03:06:41 +0200
Subject: Update jvmdowngrader to 1.1.2

---
 .github/workflows/build.yml |  6 +++---
 build.gradle.kts            | 21 ++++++++++++++++++---
 settings.gradle.kts         |  4 ++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5f299d28..7a1ab03e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,17 +37,17 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Quests-JDK1.8 (use at your own risk)
-          path: build/libs/*-downgraded-8.jar
+          path: build/libs/*-downgraded-8-shaded.jar
           if-no-files-found: error
       - name: Upload the downgraded Java 16 plugin JAR
         uses: actions/upload-artifact@v4
         with:
           name: Quests-JDK16 (use at your own risk)
-          path: build/libs/*-downgraded-16.jar
+          path: build/libs/*-downgraded-16-shaded.jar
           if-no-files-found: error
       - name: Upload the downgraded Java 17 plugin JAR
         uses: actions/upload-artifact@v4
         with:
           name: Quests-JDK17 (use at your own risk)
-          path: build/libs/*-downgraded-17.jar
+          path: build/libs/*-downgraded-17-shaded.jar
           if-no-files-found: error
diff --git a/build.gradle.kts b/build.gradle.kts
index c58c6dc3..a199a5ca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,5 @@
 import xyz.wagyourtail.jvmdg.gradle.task.DowngradeJar
+import xyz.wagyourtail.jvmdg.gradle.task.ShadeJar
 import java.io.ByteArrayOutputStream
 
 plugins {
@@ -91,9 +92,9 @@ for (javaVersion in javaVersions) {
     // we use this hacky solution to improve display and sort order in IntelliJ Gradle tab
     val majorVersion = javaVersion.ordinal + 1
     val majorVersionFormatted = String.format("%02d", majorVersion)
-    val taskName = "downgrade${majorVersionFormatted}AllJar"
+    val downgradeTaskName = "downgrade${majorVersionFormatted}AllJar"
 
-    tasks.register<DowngradeJar>(taskName) {
+    tasks.register<DowngradeJar>(downgradeTaskName) {
         inputFile = allJarTask.archiveFile
         downgradeTo = javaVersion
         quiet = true
@@ -102,7 +103,21 @@ for (javaVersion in javaVersions) {
         archiveClassifier = "downgraded-${majorVersion}"
     }
 
-    defaultTasks.add(taskName)
+    val downgradeJarTask = tasks.getByName<DowngradeJar>(downgradeTaskName)
+    val shadeTaskName = "shade${majorVersionFormatted}Downgrade"
+
+    tasks.register<ShadeJar>(shadeTaskName) {
+        inputFile = downgradeJarTask.archiveFile
+        downgradeTo = javaVersion
+        quiet = true
+
+        archiveBaseName = "Quests"
+        archiveClassifier = "downgraded-${majorVersion}-shaded"
+
+        shadePath = { _ -> "com/leonardobishop/quests/jvmdg" }
+    }
+
+    defaultTasks.add(shadeTaskName)
 }
 
 artifacts {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 87c44507..5683b264 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,8 +8,8 @@ pluginManagement {
 
     plugins {
         id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-        id("io.github.goooler.shadow") version "8.1.7"
-        id("xyz.wagyourtail.jvmdowngrader") version "0.7.1"
+        id("io.github.goooler.shadow") version "8.1.8"
+        id("xyz.wagyourtail.jvmdowngrader") version "1.1.2"
     }
 }
 
-- 
cgit v1.2.3-70-g09d2