Skip to content

Commit

Permalink
Cross build to sbt 2.0.0-M3
Browse files Browse the repository at this point in the history
  • Loading branch information
eed3si9n committed Dec 26, 2024
1 parent 2619435 commit bd1caea
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ Global / onChangedBuildSource := ReloadOnSourceChanges

// crossBuildingSettings
lazy val scala212 = "2.12.20"
lazy val scala3 = "3.3.4"
lazy val scala3 = "3.6.2"
Global / scalaVersion := scala3
crossScalaVersions := Seq(scala3, scala212)
(pluginCrossBuild / sbtVersion) := {
scalaBinaryVersion.value match {
case "2.12" => "1.5.8"
case _ => "2.0.0-M2"
case _ => "2.0.0-M3"
}
}
scriptedSbt := {
scalaBinaryVersion.value match {
case "2.12" => "1.10.5"
case _ => "2.0.0-M2"
case "2.12" => "1.10.7"
case _ => "2.0.0-M3"
}
}

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.7
6 changes: 3 additions & 3 deletions src/main/scala/com/typesafe/sbt/packager/SettingsHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ object SettingsHelper {
_,
extension,
extension,
classifier = classifier,
configurations = Vector.empty,
url = None
classifier,
Vector.empty,
None
)),
packageTask
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package linux

import sbt.{*, given}
import LinuxPlugin.Users
import com.typesafe.sbt.packager.linux.{ Mapper => M }

case class LinuxFileMetaData(
user: String = Users.Root,
Expand Down Expand Up @@ -31,7 +32,7 @@ case class LinuxPackageMapping(
def withPerms(perms: String) = copy(fileData = fileData withPerms perms)
def withConfig(c: String = "true") = copy(fileData = fileData withConfig c)
def withContents() =
copy(mappings = Mapper.mapDirectoryAndContents(mappings.toSeq: _*))
copy(mappings = M.mapDirectoryAndContents(mappings.toSeq*))
def asDocs() = copy(fileData = fileData.asDocs())

/** Modifies the current package mapping to have gzipped data. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ object WixHelper {
val filenamesPrep =
for {
f <- features
ComponentFile(name, _) <- f.components
case ComponentFile(name, _) <- f.components
} yield allParentDirs(file(name))
val filenames = filenamesPrep.flatten.map(_.toString.replaceAll("\\\\", "/")).filter(_ != "")
// Now for directories...
Expand Down

0 comments on commit bd1caea

Please sign in to comment.