From 1b4c0ba17799a1248720168be4f303feca3c2227 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Fri, 5 Sep 2025 06:58:30 +0900
Subject: [PATCH] remove scala-arm dependency

---
 build.sbt                                             |  1 -
 .../github/sbt/jacoco/data/ExecutionDataUtils.scala   | 10 +++-------
 .../github/sbt/jacoco/data/InstrumentationUtils.scala | 11 ++++++-----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/build.sbt b/build.sbt
index b23cb5bb..1e8829ee 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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",
diff --git a/src/main/scala/com/github/sbt/jacoco/data/ExecutionDataUtils.scala b/src/main/scala/com/github/sbt/jacoco/data/ExecutionDataUtils.scala
index 005d82fa..6a2e1dc8 100644
--- a/src/main/scala/com/github/sbt/jacoco/data/ExecutionDataUtils.scala
+++ b/src/main/scala/com/github/sbt/jacoco/data/ExecutionDataUtils.scala
@@ -16,9 +16,9 @@ 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 = {
@@ -26,9 +26,7 @@ object ExecutionDataUtils {
       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)
       }
@@ -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)
diff --git a/src/main/scala/com/github/sbt/jacoco/data/InstrumentationUtils.scala b/src/main/scala/com/github/sbt/jacoco/data/InstrumentationUtils.scala
index 7ab6415b..a9d0a0d9 100644
--- a/src/main/scala/com/github/sbt/jacoco/data/InstrumentationUtils.scala
+++ b/src/main/scala/com/github/sbt/jacoco/data/InstrumentationUtils.scala
@@ -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 {
 
@@ -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)