Skip to content

Commit 8233646

Browse files
committed
Merge branch 'main' into update/scala-library-2.13.16
2 parents 9a69e76 + 2113596 commit 8233646

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Scala Steward: Reformat with scalafmt 3.8.5
2+
11f33debff2189bb969883f10a33b75ffcde82b5

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.8.3
1+
version = 3.8.5
22
runner.dialect = scala213source3
33
assumeStandardLibraryStripMargin = true
44
align.openParenCallSite = false

modules/core/src/main/scala/org/scalasteward/core/forge/data/NewPullRequestData.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,8 @@ object NewPullRequestData {
242242
.map { scalafixEdit =>
243243
val migration = scalafixEdit.migration
244244
val listElements =
245-
(migration.rewriteRules.map(rule => s" * $rule").toList ++ migration.doc.map(uri =>
246-
s" * Documentation: $uri"
247-
)).mkString("\n")
245+
(migration.rewriteRules.map(rule => s" * $rule").toList ++ migration.doc
246+
.map(uri => s" * Documentation: $uri")).mkString("\n")
248247
val artifactName = migration.artifactIds match {
249248
case Nel(one, Nil) => one
250249
case multiple => multiple.toList.mkString("{", ",", "}")

modules/core/src/main/scala/org/scalasteward/core/repoconfig/RepoConfigAlg.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,8 @@ object RepoConfigAlg {
9898
case active :: remaining =>
9999
F.pure(active.some)
100100
.productL(
101-
remaining.traverse_(file =>
102-
logger.warn(s"""Ignored config file "${file.pathAsString}"""")
103-
)
101+
remaining
102+
.traverse_(file => logger.warn(s"""Ignored config file "${file.pathAsString}""""))
104103
)
105104
}
106105
}

modules/core/src/test/scala/org/scalasteward/core/edit/update/VersionPositionScannerTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class VersionPositionScannerTest extends FunSuite {
6767
val d = "org.scala-js".g % "sbt-scalajs".a % "0.6.23"
6868
val fd = FileData(
6969
"plugins.sbt",
70-
s"""addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
70+
s"""addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
7171
|addSbtPlugin("${d.groupId}" % "${d.artifactId.name}" % "${d.version}")
7272
|addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0")""".stripMargin
7373
)

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import sbt.*
22

33
object Dependencies {
4-
val bcprovJdk15to18 = "org.bouncycastle" % "bcprov-jdk15to18" % "1.79"
4+
val bcprovJdk15to18 = "org.bouncycastle" % "bcprov-jdk15to18" % "1.80"
55
val betterFiles = "com.github.pathikrit" %% "better-files" % "3.9.2"
66
val catsEffect = "org.typelevel" %% "cats-effect" % "3.5.7"
77
val catsCore = "org.typelevel" %% "cats-core" % "2.12.0"

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
22
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
33
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
4-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
4+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
55
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1")
66
addSbtPlugin("io.github.sbt-doctest" % "sbt-doctest" % "0.11.1")
77
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0")
@@ -11,6 +11,6 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
1111
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
1212
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.2")
1313
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0")
14-
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.5")
14+
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.6")
1515

1616
ThisBuild / evictionErrorLevel := Level.Info

0 commit comments

Comments
 (0)