better error wrapping

unimined · May 12, 2024 · 7985db6 · 7985db6
1 parent 99ffffb
commit 7985db6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/task/DowngradeJar.kt b/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/task/DowngradeJar.kt
@@ -38,7 +38,8 @@ abstract class DowngradeJar @Inject constructor(@Internal val jvmdg: JVMDowngrad
     fun doDowngrade() {
         val tempOutput = temporaryDir.resolve("downgradedInput.jar")
         tempOutput.deleteIfExists()
-        val result = project.javaexec {
+
+        project.javaexec {
             it.mainClass.set("xyz.wagyourtail.jvmdg.compile.ZipDowngrader")
             it.args = listOf(
                 jvToOpc(downgradeTo).toString(),
@@ -49,10 +50,8 @@ abstract class DowngradeJar @Inject constructor(@Internal val jvmdg: JVMDowngrad
             it.workingDir = temporaryDir
             it.classpath = jvmdg.core
             it.jvmArgs = listOf("-Djvmdg.java-api=${jvmdg.api.resolve().first { it.extension == "jar" }.absolutePath}")
-        }
-        if (result.exitValue != 0) {
-            throw Exception("Failed to downgrade jar")
-        }
+        }.assertNormalExitValue().rethrowFailure()
+
         from(project.zipTree(tempOutput))
         copy()
     }

diff --git a/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/task/ShadeAPI.kt b/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/task/ShadeAPI.kt
@@ -37,7 +37,8 @@ abstract class ShadeAPI @Inject constructor(@Internal val jvmdg: JVMDowngraderEx
     fun doShade() {
         val tempOutput = temporaryDir.resolve("downgradedInput.jar")
         tempOutput.deleteIfExists()
-        val result = project.javaexec {
+
+        project.javaexec {
             it.mainClass.set("xyz.wagyourtail.jvmdg.compile.ApiShader")
             it.args = listOf(
                 jvmdg.api.resolve().first { it.extension == "jar" }.absolutePath,
@@ -47,10 +48,8 @@ abstract class ShadeAPI @Inject constructor(@Internal val jvmdg: JVMDowngraderEx
             )
             it.workingDir = temporaryDir
             it.classpath = jvmdg.core
-        }
-        if (result.exitValue != 0) {
-            throw Exception("Failed to downgrade jar")
-        }
+        }.assertNormalExitValue().rethrowFailure()
+
         from(project.zipTree(tempOutput))
         copy()
     }