fix coverage

unimined · Jun 19, 2024 · 8c5e69f · 8c5e69f
1 parent 665801a
commit 8c5e69f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/buildSrc/src/main/kotlin/xyz/wagyourtail/gradle/coverage/CoverageRunTask.kt b/buildSrc/src/main/kotlin/xyz/wagyourtail/gradle/coverage/CoverageRunTask.kt
@@ -30,7 +30,7 @@ abstract class CoverageRunTask : ConventionTask() {
 
     init {
         group = "jvmdg"
-        coverageReports = project.files(temporaryDir.resolve("coverage"))
+        coverageReports = project.files(project.layout.buildDirectory.asFile.get().resolve("coverage"))
     }
 
     @TaskAction
@@ -42,7 +42,7 @@ abstract class CoverageRunTask : ConventionTask() {
                 it.languageVersion.set(JavaLanguageVersion.of(javaVersion.get().majorVersion))
             }.get().executablePath.asFile.absolutePath
 
-            spec.workingDir = temporaryDir
+            spec.workingDir = project.layout.buildDirectory.asFile.get()
             spec.mainClass.set("xyz.wagyourtail.jvmdg.coverage.ApiCoverageChecker")
             spec.classpath = classpath
             spec.jvmArgs("-Djvmdg.java-api=${apiJar.get().asFile.absolutePath}", "-Djvmdg.quiet=true")

diff --git a/java-api/build.gradle.kts b/java-api/build.gradle.kts
@@ -148,7 +148,7 @@ val genCtSym by tasks.registering(GenerateCtSymTask::class) {
 
 val coverageReport by tasks.registering(CoverageRunTask::class) {
     group = "jvmdg"
-    dependsOn(coverageApiJar, genCtSym)
+    dependsOn(coverageApiJar, genCtSym, tasks.getByName("compileCoverageJava"))
     apiJar.set(coverageApiJar.get().archiveFile.get().asFile)
     classpath = coverage.runtimeClasspath
     ctSym.set(genCtSym.get().ctSym)

diff --git a/src/shared/java/xyz/wagyourtail/jvmdg/util/Utils.java b/src/shared/java/xyz/wagyourtail/jvmdg/util/Utils.java
@@ -8,7 +8,6 @@
 import java.io.InputStream;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Field;
-import java.net.URI;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;