[1.7.2] Use shadowed jars instead of dev jars, fixes #83, fixes #85

3arthqu4ke · Jul 23, 2023 · 7afbe4e · 7afbe4e
1 parent 57ec6de
commit 7afbe4e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -131,9 +131,13 @@ allprojects {
         }
     }
 
+    jar {
+        classifier 'dev'
+    }
+
     shadowJar {
         configurations = [project.configurations.jarLibs, project.configurations.jarLibsApi]
-        classifier 'release'
+        classifier ''
     }
 
     jar.finalizedBy(shadowJar)
@@ -208,13 +212,13 @@ tasks.register('jacocoRootReport', JacocoReport) {
 }
 
 tasks.register('copyJars', Copy) {
-    dependsOn subprojects.jar
-    from(subprojects.jar)
+    dependsOn subprojects.shadowJar
+    from(subprojects.shadowJar)
     into project.file(System.getProperty('hmc.jar.dir', 'build/libs'))
 }
 
-jar {
-    dependsOn(subprojects.jar)
+build {
+    dependsOn(subprojects.shadowJar)
     finalizedBy(copyJars)
 }
 

diff --git a/headlessmc-lwjgl/build.gradle b/headlessmc-lwjgl/build.gradle
@@ -75,7 +75,7 @@ tasks.register('testAgent', Test) {
     }
 
     jvmArgs = [
-        "-javaagent:$projectDir/build/libs/headlessmc-lwjgl-${rootProject.version}-release.jar",
+        "-javaagent:$projectDir/build/libs/headlessmc-lwjgl-${rootProject.version}.jar",
         '-Dhmc.lwjgl.agenttest=true'
     ]