From 6fedf29f0f2076dbabc1e8a5c65e074f13e1ab42 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 10 Nov 2024 05:11:30 -0500
Subject: [PATCH] scalafmt

---
 .scalafmt.conf                                              | 1 +
 .../scala-3/com/typesafe/sbt/packager/PluginCompat.scala    | 6 +++---
 src/sbt-test/jlink/test-jlink-misc/build.sbt                | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index 84293359d..0662a5b12 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -13,3 +13,4 @@ project.excludePaths = [
   #   WixHelper.scala:105: error: Unable to format file due to bug in scalafmt
   "glob:**/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala"
 ]
+project.layout = StandardConvention
diff --git a/src/main/scala-3/com/typesafe/sbt/packager/PluginCompat.scala b/src/main/scala-3/com/typesafe/sbt/packager/PluginCompat.scala
index cb3d1ac6e..00c4dde35 100644
--- a/src/main/scala-3/com/typesafe/sbt/packager/PluginCompat.scala
+++ b/src/main/scala-3/com/typesafe/sbt/packager/PluginCompat.scala
@@ -1,10 +1,10 @@
 package com.typesafe.sbt.packager
 
 import java.io.File
-import java.nio.file.{ Path => NioPath }
+import java.nio.file.{Path => NioPath}
 import java.util.jar.Attributes
 import sbt.*
-import xsbti.{ FileConverter, HashedVirtualFileRef, VirtualFile, VirtualFileRef }
+import xsbti.{FileConverter, HashedVirtualFileRef, VirtualFile, VirtualFileRef}
 import sbt.internal.RemoteCache
 
 private[packager] object PluginCompat:
@@ -22,7 +22,7 @@ private[packager] object PluginCompat:
 
   def parseArtifactStrAttribute(str: String): Artifact =
     import sbt.librarymanagement.LibraryManagementCodec.ArtifactFormat
-    import sjsonnew.support.scalajson.unsafe.* 
+    import sjsonnew.support.scalajson.unsafe.*
     Converter.fromJsonUnsafe[Artifact](Parser.parseUnsafe(str))
   def artifactToStr(art: Artifact): String =
     import sbt.librarymanagement.LibraryManagementCodec.ArtifactFormat
diff --git a/src/sbt-test/jlink/test-jlink-misc/build.sbt b/src/sbt-test/jlink/test-jlink-misc/build.sbt
index 8abb6fbd9..8afe6f765 100644
--- a/src/sbt-test/jlink/test-jlink-misc/build.sbt
+++ b/src/sbt-test/jlink/test-jlink-misc/build.sbt
@@ -106,8 +106,7 @@ val issue1293 = project
     // Use `paramaner` (and only it) as an automatic module
     jlinkModulePath := {
       // Get the full classpath with all the resolved dependencies.
-      (jlinkBuildImage / fullClasspath)
-        .value
+      (jlinkBuildImage / fullClasspath).value
         // Find the ones that have `paranamer` as their artifact names.
         .filter { item =>
           item.get(moduleID.key).exists { modId =>