Skip to content

FDN-3924 Bump scala minor version #190

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
jackl merged 3 commits into from
Aug 19, 2025
Merged

FDN-3924 Bump scala minor version #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4fa628
FDN-3924 Bump scala minor version
jackl Aug 19, 2025
cd7ebcb
bump in ci also
jackl Aug 19, 2025
8460275
Missing version bump
jackl Aug 19, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
7 changes: 5 additions & 2 deletions src/main/scala/io/apibuilder/validation/zip/ZipFileReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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") }
}

/**
Expand Down