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 scalafmt-core to 3.8.5 #364

Merged
merged 3 commits into from
Jan 19, 2025
Merged

Update scalafmt-core to 3.8.5 #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a471e9d
Update scalafmt-core to 3.8.5
scala-steward Jan 19, 2025
4b3d644
Reformat with scalafmt 3.8.5
scala-steward Jan 19, 2025
396bb19
Add 'Reformat with scalafmt 3.8.5' to .git-blame-ignore-revs
scala-steward Jan 19, 2025
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

# scalafix
a3908221128f6d52be1592635c31368ed4224f96

# Scala Steward: Reformat with scalafmt 3.8.5
4b3d6446385f2890831b10122b15937ca0cc5d73
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.3
version = 3.8.5
runner.dialect = scala212
preset = default
maxColumn = 120
Expand Down
3 changes: 1 addition & 2 deletions src/main/scala/net/bzzt/reproduciblebuilds/GpgHelpers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(_))
}
)
}
5 changes: 2 additions & 3 deletions src/main/scala/net/bzzt/reproduciblebuilds/ReproducibleBuildsPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ object ReproducibleBuildsPlugin extends AutoPlugin {
},
publishTo := Some(bzztNetResolver)
) ++ gpgPluginSettings ++ Seq(
publishConfiguration := {
publishConfiguration :=
publishConfig(
// avoid uploading an ivy-[version].xml
publishMavenStyle = true,
Expand All @@ -281,8 +281,7 @@ object ReproducibleBuildsPlugin extends AutoPlugin {
},
ivyLoggingLevel.value,
isSnapshot.value
)
},
),
publishLocalConfiguration := publishConfig(
// avoid overwriting an ivy-[version].xml
publishMavenStyle = true,
Expand Down
3 changes: 1 addition & 2 deletions src/main/scala/net/bzzt/reproduciblebuilds/SbtLibraryManagementFunctions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading