diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index d48f1b5..279bba4 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # scalafix a3908221128f6d52be1592635c31368ed4224f96 + +# Scala Steward: Reformat with scalafmt 3.8.5 +4b3d6446385f2890831b10122b15937ca0cc5d73 diff --git a/.scalafmt.conf b/.scalafmt.conf index 4befca3..549c2f4 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.8.5 runner.dialect = scala212 preset = default maxColumn = 120 diff --git a/src/main/scala/net/bzzt/reproduciblebuilds/GpgHelpers.scala b/src/main/scala/net/bzzt/reproduciblebuilds/GpgHelpers.scala index 670106f..3388288 100644 --- a/src/main/scala/net/bzzt/reproduciblebuilds/GpgHelpers.scala +++ b/src/main/scala/net/bzzt/reproduciblebuilds/GpgHelpers.scala @@ -24,8 +24,7 @@ import sbt.Setting object GpgHelpers { val settings: Seq[Setting[_]] = Seq( - packagedArtifacts := { + packagedArtifacts := packagedArtifactsImpl(packagedArtifacts.value, gpg.value, gpgWarnOnFailure.value)(streams.value.log.warn(_)) - } ) } diff --git a/src/main/scala/net/bzzt/reproduciblebuilds/ReproducibleBuildsPlugin.scala b/src/main/scala/net/bzzt/reproduciblebuilds/ReproducibleBuildsPlugin.scala index 0aa8213..888d494 100644 --- a/src/main/scala/net/bzzt/reproduciblebuilds/ReproducibleBuildsPlugin.scala +++ b/src/main/scala/net/bzzt/reproduciblebuilds/ReproducibleBuildsPlugin.scala @@ -267,7 +267,7 @@ object ReproducibleBuildsPlugin extends AutoPlugin { }, publishTo := Some(bzztNetResolver) ) ++ gpgPluginSettings ++ Seq( - publishConfiguration := { + publishConfiguration := publishConfig( // avoid uploading an ivy-[version].xml publishMavenStyle = true, @@ -281,8 +281,7 @@ object ReproducibleBuildsPlugin extends AutoPlugin { }, ivyLoggingLevel.value, isSnapshot.value - ) - }, + ), publishLocalConfiguration := publishConfig( // avoid overwriting an ivy-[version].xml publishMavenStyle = true, diff --git a/src/main/scala/net/bzzt/reproduciblebuilds/SbtLibraryManagementFunctions.scala b/src/main/scala/net/bzzt/reproduciblebuilds/SbtLibraryManagementFunctions.scala index b0baeda..0840e9e 100644 --- a/src/main/scala/net/bzzt/reproduciblebuilds/SbtLibraryManagementFunctions.scala +++ b/src/main/scala/net/bzzt/reproduciblebuilds/SbtLibraryManagementFunctions.scala @@ -17,8 +17,7 @@ import sbt.{Artifact, ConfigRef, Configuration, CrossVersion, ExclusionRule, Inl private[reproduciblebuilds] object SbtLibraryManagementFunctions { def javaMap(m: Map[String, String], unqualify: Boolean = false) = { import scala.collection.JavaConverters._ - val map = if (unqualify) m map { case (k, v) => (k.stripPrefix("e:"), v) } - else m + val map = if (unqualify) m map { case (k, v) => (k.stripPrefix("e:"), v) } else m if (map.isEmpty) null else map.asJava }