pt 2, electric boogaloo

unimined · Mar 6, 2024 · af7863a · af7863a
1 parent bfc28d4
commit af7863a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -160,11 +160,8 @@ publishing {
             version = rootProject.version as String
 
             artifact(project.tasks.jar) {}
-            artifact(project.tasks.shadowJar) {
-                classifier = "all"
-            }
             artifact(project.tasks["jarInJar"]) {
-                classifier = "all-java-api"
+                classifier = "all"
             }
         }
     }

diff --git a/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/JVMDowngraderExtension.kt b/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/JVMDowngraderExtension.kt
@@ -13,6 +13,8 @@ abstract class JVMDowngraderExtension(val project: Project) {
 
     var version by FinalizeOnRead(JVMDowngraderPlugin::class.java.`package`.implementationVersion ?: "0.0.1")
 
+    var asmVersion by FinalizeOnRead("9.6")
+
     val defaultTask = project.tasks.register("downgradeJar", DowngradeJar::class.java, this).apply {
         configure {
             val jar = (project.tasks.findByName("shadowJar") ?: project.tasks.getByName("jar")) as Jar
@@ -28,7 +30,13 @@ abstract class JVMDowngraderExtension(val project: Project) {
         }
     }
 
-    val core = project.configurations.detachedConfiguration(project.dependencies.create("xyz.wagyourtail.jvmdowngrader:jvmdowngrader:${version}:all"))
+    val core = project.configurations.detachedConfiguration(
+        project.dependencies.create("xyz.wagyourtail.jvmdowngrader:jvmdowngrader:${version}"),
+        project.dependencies.create("org.ow2.asm:asm:$asmVersion"),
+        project.dependencies.create("org.ow2.asm:asm-commons:$asmVersion"),
+        project.dependencies.create("org.ow2.asm:asm-tree:$asmVersion"),
+        project.dependencies.create("org.ow2.asm:asm-util:$asmVersion"),
+    )
 
     val api = project.configurations.detachedConfiguration(project.dependencies.create("xyz.wagyourtail.jvmdowngrader:jvmdowngrader-java-api:${version}"))