diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f7fcc3..47ec23a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: java: [ '17' ] - scala: [ '2.13.15' ] + scala: [ '2.13.16' ] steps: - uses: actions/checkout@v4 - name: Set up JDK diff --git a/build.sbt b/build.sbt index fb53f71..60421ea 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -lazy val scala2 = "2.13.15" +lazy val scala2 = "2.13.16" lazy val scala3 = "3.4.2" lazy val supportedScalaVersions = List(scala2, scala3) diff --git a/src/main/scala/io/apibuilder/validation/zip/ZipFileReader.scala b/src/main/scala/io/apibuilder/validation/zip/ZipFileReader.scala index 9386221..8089228 100644 --- a/src/main/scala/io/apibuilder/validation/zip/ZipFileReader.scala +++ b/src/main/scala/io/apibuilder/validation/zip/ZipFileReader.scala @@ -8,7 +8,9 @@ import java.nio.file.Files import java.util.zip.ZipEntry import java.util.zip.ZipInputStream import io.apibuilder.validation.util.UrlDownloader -import org.apache.commons.io.FileUtils +import org.apache.commons.io.FileDeleteStrategy + +import scala.util.control.NonFatal object ZipFileReader { @@ -42,7 +44,8 @@ case class ZipFileReader(inputStream: InputStream) extends AutoCloseable { private val destDir: File = Files.createTempDirectory("zipfilereader").toFile override def close(): Unit = { - FileUtils.deleteQuietly(destDir) + try FileDeleteStrategy.FORCE.delete(destDir) + catch { case NonFatal(ex) => println(s"Error deleting zipfilereader folder '${ex.getMessage}', ignoring") } } /**