From bd1caeaa201a59556b2871c3ff5e9c53d5d20d23 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 26 Dec 2024 04:26:00 -0500
Subject: [PATCH] Cross build to sbt 2.0.0-M3

---
 build.sbt                                                 | 8 ++++----
 project/build.properties                                  | 2 +-
 .../scala/com/typesafe/sbt/packager/SettingsHelper.scala  | 6 +++---
 .../typesafe/sbt/packager/linux/LinuxPackageMapping.scala | 3 ++-
 .../com/typesafe/sbt/packager/windows/WixHelper.scala     | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build.sbt b/build.sbt
index 34e822142..0686af04a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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"
   }
 }
 
diff --git a/project/build.properties b/project/build.properties
index 0b699c305..73df629ac 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.7
diff --git a/src/main/scala/com/typesafe/sbt/packager/SettingsHelper.scala b/src/main/scala/com/typesafe/sbt/packager/SettingsHelper.scala
index b9124f03b..006c8b5b3 100644
--- a/src/main/scala/com/typesafe/sbt/packager/SettingsHelper.scala
+++ b/src/main/scala/com/typesafe/sbt/packager/SettingsHelper.scala
@@ -25,9 +25,9 @@ object SettingsHelper {
           _,
           extension,
           extension,
-          classifier = classifier,
-          configurations = Vector.empty,
-          url = None
+          classifier,
+          Vector.empty,
+          None
         )),
         packageTask
       )
diff --git a/src/main/scala/com/typesafe/sbt/packager/linux/LinuxPackageMapping.scala b/src/main/scala/com/typesafe/sbt/packager/linux/LinuxPackageMapping.scala
index 5e1fe1d55..5ab1f78bf 100644
--- a/src/main/scala/com/typesafe/sbt/packager/linux/LinuxPackageMapping.scala
+++ b/src/main/scala/com/typesafe/sbt/packager/linux/LinuxPackageMapping.scala
@@ -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,
@@ -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. */
diff --git a/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala b/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala
index 15d67a933..2902fc610 100644
--- a/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala
+++ b/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala
@@ -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...