Skip to content
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

Update scala-library to 2.13.13 #1599

Closed
wants to merge 2 commits into from
Closed

Update scala-library to 2.13.13 #1599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
077091d
Applied Scalafix rule(s) dependency:[email protected]…
scala-steward Apr 13, 2024
445ef6b
Update scala-library to 2.13.13
scala-steward Apr 13, 2024
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 build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ organization := "com.github.sbt"
homepage := Some(url("https://github.com/sbt/sbt-native-packager"))

Global / onChangedBuildSource := ReloadOnSourceChanges
Global / scalaVersion := "2.12.19"
Global / scalaVersion := "2.13.13"

// crossBuildingSettings
crossSbtVersions := Vector("1.1.6")
Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/com/typesafe/sbt/packager/linux/LinuxPackageMapping.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package linux

import sbt._
import LinuxPlugin.Users
import scala.Iterable

case class LinuxFileMetaData(
user: String = Users.Root,
Expand All @@ -21,7 +22,7 @@ case class LinuxFileMetaData(
}

case class LinuxPackageMapping(
mappings: Traversable[(File, String)],
mappings: Iterable[(File, String)],
fileData: LinuxFileMetaData = LinuxFileMetaData(),
zipped: Boolean = false
) {
Expand Down
7 changes: 4 additions & 3 deletions src/main/scala/com/typesafe/sbt/packager/universal/ZipHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import org.apache.commons.compress.utils.IOUtils
import sbt._

import scala.collection.JavaConverters._
import scala.Iterable

/**
* Module with functions associated with processing zip files.
Expand All @@ -34,7 +35,7 @@ object ZipHelper {
* @param outputZip
* The location of the output file.
*/
def zipNative(sources: Traversable[(File, String)], outputZip: File): Unit =
def zipNative(sources: Iterable[(File, String)], outputZip: File): Unit =
IO.withTemporaryDirectory { dir =>
val name = outputZip.getName
val zipDir = dir / (if (name endsWith ".zip") name dropRight 4 else name)
Expand Down Expand Up @@ -69,7 +70,7 @@ object ZipHelper {
* @param outputZip
* The location of the output file.
*/
def zip(sources: Traversable[(File, String)], outputZip: File): Unit = {
def zip(sources: Iterable[(File, String)], outputZip: File): Unit = {
import permissions.OctalString
val mappings =
for {
Expand All @@ -90,7 +91,7 @@ object ZipHelper {
* @param outputZip
* The location of the output file.
*/
def zipNIO(sources: Traversable[(File, String)], outputZip: File): Unit = {
def zipNIO(sources: Iterable[(File, String)], outputZip: File): Unit = {
require(!outputZip.isDirectory, "Specified output file " + outputZip + " is a directory.")
val mappings = sources.toSeq.map { case (file, name) =>
FileMapping(file, name)
Expand Down
5 changes: 3 additions & 2 deletions src/test/scala/com/typesafe/sbt/packager/universal/ZipHelperSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import org.scalatest._
import java.io.File
import java.nio.file.{Files, Path, Paths}
import java.nio.file.attribute.PosixFilePermission._
import scala.collection.JavaConversions._
import scala.Iterable
import scala.collection.JavaConverters._

class ZipHelperSpec extends WordSpec with Matchers with BeforeAndAfterEach with BeforeAndAfterAll {

Expand Down Expand Up @@ -100,7 +101,7 @@ class ZipHelperSpec extends WordSpec with Matchers with BeforeAndAfterEach with
/* ========================================================== */
/* ========================================================== */

private type Zipper = (Traversable[(File, String)], File) => Unit
private type Zipper = (Iterable[(File, String)], File) => Unit

private def zipSingleFile(zipper: Zipper): Unit = {
val out = tmp resolve "single.zip"
Expand Down
Loading