Skip to content

Commit 22eda93

Browse files
authored
Merge pull request #45 from scala-steward/update/scalafmt-core-3.7.2
Update scalafmt-core to 3.7.2
2 parents fab5344 + 187f5f3 commit 22eda93

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
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.7.2
2+
8e28be97b614687a20b667be040703ea7abdcd51

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.7.1
1+
version = 3.7.2
22

33
runner.dialect = scala3
44

build.sbt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ lazy val root =
99
.settings(commonSettings("dhallj-magnolia-root"))
1010
.settings(publishArtifact := false)
1111
.aggregate(
12-
(dhalljMagnolia.projectRefs): _*
12+
dhalljMagnolia.projectRefs: _*
1313
)
1414

1515
lazy val dhalljMagnolia = (projectMatrix in file("modules/dhallj-magnolia"))
1616
.settings(commonSettings("dhallj-magnolia"))
1717
.settings(
1818
libraryDependencies ++= Seq(
19-
"org.dhallj" %% "dhall-scala-codec" % "0.10.0-M2",
20-
"org.scalameta" %% "munit" % "0.7.27" % Test,
21-
"org.dhallj" %% "dhall-javagen" % "0.10.0-M2" % Test
19+
"org.dhallj" %% "dhall-scala-codec" % "0.10.0-M2",
20+
"org.scalameta" %% "munit" % "0.7.27" % Test,
21+
"org.dhallj" %% "dhall-javagen" % "0.10.0-M2" % Test
2222
),
2323
libraryDependencies ++= {
2424
CrossVersion.partialVersion(scalaVersion.value) match {
2525
case Some((3, _)) =>
26-
Seq("com.softwaremill.magnolia1_3" %% "magnolia" % "1.2.7")
26+
Seq("com.softwaremill.magnolia1_3" %% "magnolia" % "1.2.7")
2727
case _ =>
2828
Seq(
29-
"com.softwaremill.magnolia1_2" %% "magnolia" % "1.1.3",
30-
"org.scala-lang" % "scala-reflect" % scala2Version % Provided,
29+
"com.softwaremill.magnolia1_2" %% "magnolia" % "1.1.3",
30+
"org.scala-lang" % "scala-reflect" % scala2Version % Provided,
3131
)
3232
}
3333
},

project/Common.scala

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,21 @@ import sbt._
99
import xerial.sbt.Sonatype.GitHubHosting
1010

1111
object Common {
12-
def commonSettings(nameArg: String): Seq[Def.Setting[_]] = commonSmlBuildSettings ++ Seq(
13-
name := nameArg,
14-
organization := "pl.msitko",
1512

13+
def commonSettings(nameArg: String): Seq[Def.Setting[_]] = commonSmlBuildSettings ++ Seq(
14+
name := nameArg,
15+
organization := "pl.msitko",
1616
scalafmtOnCompile := true,
17-
1817
testFrameworks += new TestFramework("munit.Framework"),
1918
) ++ ossPublishSettings ++ Seq(
20-
sonatypeProfileName := "pl.msitko",
19+
sonatypeProfileName := "pl.msitko",
2120
organizationHomepage := Some(url("https://github.com/note")),
22-
homepage := Some(url("https://github.com/note/dhallj-magnolia")),
21+
homepage := Some(url("https://github.com/note/dhallj-magnolia")),
2322
sonatypeProjectHosting := Some(
2423
GitHubHosting("note", name.value, "[email protected]")
2524
),
2625
sonatypeCredentialHost := "oss.sonatype.org",
27-
licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT")),
26+
licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT")),
2827
developers := List(
2928
Developer(
3029
id = "note",

0 commit comments

Comments
 (0)