Skip to content

Commit 78e8ccc

Browse files
Update scalafmt-core to 3.10.1 (#989)
* Update scalafmt-core to 3.10.1 * Reformat with scalafmt 3.10.1 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.10.1' to .git-blame-ignore-revs * Refactor crossTarget configuration in build.sbt Updated crossTarget assignment to use new syntax. --------- Co-authored-by: Bendix Sältz <bendix@saeltz.de>
1 parent 4359e52 commit 78e8ccc

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ f6993516b833296bcd3bc9d93cb9b4b900bc888e
66

77
# Scala Steward: Reformat with scalafmt 3.7.4
88
4edf63a849a246160396ccf2f4da0bb2069006a2
9+
10+
# Scala Steward: Reformat with scalafmt 3.10.1
11+
743c3a81c75b2cede81564b3c06db9c099ca79cb

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.9.10"
1+
version = "3.10.1"
22
runner.dialect = scala3
33
maxColumn = 110
44
docstrings.style = Asterisk

build.sbt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ scalaVersion := "3.7.3"
2323
crossScalaVersions := Seq("2.12.19", "2.12.20", "2.13.16", "2.13.17", "3.3.7", "3.7.3")
2424
autoScalaLibrary := false
2525
crossVersion := CrossVersion.full
26-
crossTarget := {
27-
// workaround for https://github.com/sbt/sbt/issues/5097
28-
target.value / s"scala-${scalaVersion.value}"
29-
}
26+
// workaround for https://github.com/sbt/sbt/issues/5097, fixed in sbt 2.x
27+
crossTarget := target.value / s"scala-${scalaVersion.value}"
3028
versionScheme := Some("early-semver")
3129
semanticdbEnabled := (scalaBinaryVersion.value == "3")
3230
scalafixConfig := Some(file(if (scalaBinaryVersion.value == "3") ".scalafix.conf" else ".scalafix-2.conf"))

0 commit comments

Comments
 (0)