Skip to content

remove scala-arm dependency #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 5, 2025
Merged

remove scala-arm dependency #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ lazy val jacocoPlugin = (project in file("."))
libraryDependencies ++= Seq(
"org.jacoco" % "org.jacoco.core" % jacocoVersion,
"org.jacoco" % "org.jacoco.report" % jacocoVersion,
"com.jsuereth" %% "scala-arm" % "2.0",
"com.fasterxml.jackson.core" % "jackson-core" % "2.20.0",
"org.scalaj" %% "scalaj-http" % "2.4.2",
"commons-codec" % "commons-codec" % "1.19.0",
Expand Down
10 changes: 3 additions & 7 deletions src/main/scala/com/github/sbt/jacoco/data/ExecutionDataUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,17 @@ import java.io.FileOutputStream

import org.jacoco.core.data.ExecutionDataWriter
import org.jacoco.core.tools.ExecFileLoader
import resource._
import sbt.Keys.TaskStreams
import sbt._
import scala.util.Using

object ExecutionDataUtils {
def saveRuntimeData(data: ProjectData, destination: File, forked: Boolean, streams: TaskStreams): Unit = {
if (!forked) {
streams.log.debug(s"writing execution data to $destination")
IO.createDirectory(destination.getParentFile)

for {
os <- managed(new FileOutputStream(destination))
} {
Using.resource(new FileOutputStream(destination)) { os =>
val executionDataWriter = new ExecutionDataWriter(os)
data.data.collect(executionDataWriter, executionDataWriter, true)
}
Expand All @@ -46,9 +44,7 @@ object ExecutionDataUtils {

IO.createDirectory(destination.getParentFile)

for {
os <- managed(new FileOutputStream(destination))
} {
Using.resource(new FileOutputStream(destination)) { os =>
val dataWriter = new ExecutionDataWriter(os)
loader.getSessionInfoStore.accept(dataWriter)
loader.getExecutionDataStore.accept(dataWriter)
Expand Down
11 changes: 6 additions & 5 deletions src/main/scala/com/github/sbt/jacoco/data/InstrumentationUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import java.io.FileInputStream

import org.jacoco.core.instr.Instrumenter
import org.jacoco.core.runtime.OfflineInstrumentationAccessGenerator
import resource._
import sbt.Keys._
import sbt._
import scala.util.Using

object InstrumentationUtils {

Expand Down Expand Up @@ -56,11 +56,12 @@ object InstrumentationUtils {

for {
classFile <- classFiles
classStream <- managed(new FileInputStream(classFile))
} {
streams.log.debug(s"instrumenting $classFile")
val instrumentedClass = instrumenter.instrument(classStream, classFile.name)
IO.write(rebaseClassFiles(classFile).get, instrumentedClass)
Using.resource(new FileInputStream(classFile)) { classStream =>
streams.log.debug(s"instrumenting $classFile")
val instrumentedClass = instrumenter.instrument(classStream, classFile.name)
IO.write(rebaseClassFiles(classFile).get, instrumentedClass)
}
}

jacocoAgent ++ (Attributed.blank(destDirectory) +: classpath)
Expand Down