Skip to content

Commit

Permalink
Merge pull request #21 from i10416/update/scalafmt-core-3.5.9
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.5.9
  • Loading branch information
i10416 authored Sep 25, 2022
2 parents 347e5d0 + 830ca27 commit 7c56a1e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.5.9
14ecbdf02c54a1e0a4fb5bf55eff8f0ae62bd02f
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

version = "3.5.8"
version = "3.5.9"

runner.dialect = scala213
fileOverride {
Expand Down
2 changes: 1 addition & 1 deletion src/main/g8/.scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.5.8"
version = "3.5.9"
runner.dialect = scala213
fileOverride {
"glob:**/core/src/main/scala-3/**" {
Expand Down
5 changes: 2 additions & 3 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ lazy val noPublishSettings = Seq(
publishTo := None
)



lazy val root = (project in file("."))
.settings(noPublishSettings)
.settings(
Expand All @@ -54,7 +52,8 @@ lazy val core = (projectMatrix in file("core"))
.settings(
name := "$name$-core",
scalacOptions ++= {
if (scalaVersion.value.startsWith("2.12")) Seq("-language:higherKinds","-Ypartial-unification")
if (scalaVersion.value.startsWith("2.12"))
Seq("-language:higherKinds", "-Ypartial-unification")
else Nil
},
libraryDependencies ++= munit.value.map(_ % Test)
Expand Down

0 comments on commit 7c56a1e

Please sign in to comment.