This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-sbt.git
The following commit(s) were added to refs/heads/main by this push:
new 79e8c2b Update scalafmt-core to 3.10.5
79e8c2b is described below
commit 79e8c2b4a645c410f4d1fbf6848e66254ec24bcd
Author: Scala Steward <[email protected]>
AuthorDate: Wed Jan 28 12:12:15 2026 -0500
Update scalafmt-core to 3.10.5
Reformat with scalafmt 3.10.5
Executed command: scalafmt --non-interactive
Update README documentation to follow scalafmt
---
.scalafmt.conf | 2 +-
README.md | 4 ++--
src/sbt-test/sbt-daffodil/builds-charset-01/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/builds-layer-01/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/builds-udf-01/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/common-settings-01/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/cross-versions-01/build.sbt | 2 +-
.../src/main/scala-daffodil-3.10.0/OnlyScala212.scala | 2 +-
.../cross-versions-01/src/main/scala/AllScala.scala | 2 +-
src/sbt-test/sbt-daffodil/cross-versions-02/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/cross-versions-03/build.sbt | 11 ++++++-----
.../cross-versions-03/plugin/src/main/scala/Test.scala | 2 +-
src/sbt-test/sbt-daffodil/flat-layout-01/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/saved-parsers-01/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/saved-parsers-02/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/saved-parsers-03/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/saved-parsers-04/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/saved-parsers-05/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/saved-parsers-06/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/tdml-junit-01/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/tdml-saved-parser-01/build.sbt | 2 +-
src/sbt-test/sbt-daffodil/versions-01/build.sbt | 2 +-
22 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 0291405..fde4144 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -32,4 +32,4 @@ rewrite.rules = [
rewrite.trailingCommas.style = never
runner.dialect = scala212
spaces.inImportCurlyBraces = true
-version = 3.9.10
+version = 3.10.5
diff --git a/README.md b/README.md
index a714bef..69f8b95 100644
--- a/README.md
+++ b/README.md
@@ -238,7 +238,7 @@ should usually be `daffodilVersion.value`. For example:
```scala
libraryDependencies ++= Seq(
- "org.example" % "dfdl-fmt" % "1.0.0" daffodilBin(daffodilVersion.value)
+ ("org.example" % "dfdl-fmt" % "1.0.0").daffodilBin(daffodilVersion.value)
)
```
@@ -295,7 +295,7 @@ to specify Daffodil compatibility of the plugin--it should
usually be
```scala
libraryDependencies ++= Seq(
- "org.example" % "daffodil-layer-plugin" % "1.0.0"
daffodilPlugin(daffodilVersion.value)
+ ("org.example" % "daffodil-layer-plugin" %
"1.0.0").daffodilPlugin(daffodilVersion.value)
)
```
diff --git a/src/sbt-test/sbt-daffodil/builds-charset-01/build.sbt
b/src/sbt-test/sbt-daffodil/builds-charset-01/build.sbt
index a486b09..426fe0b 100644
--- a/src/sbt-test/sbt-daffodil/builds-charset-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/builds-charset-01/build.sbt
@@ -21,6 +21,6 @@ val test = (project in file("."))
name := "test",
organization := "com.example",
daffodilVersion := "3.6.0",
- daffodilBuildsCharset := true,
+ daffodilBuildsCharset := true
)
.daffodilProject()
diff --git a/src/sbt-test/sbt-daffodil/builds-layer-01/build.sbt
b/src/sbt-test/sbt-daffodil/builds-layer-01/build.sbt
index cd3b4b9..311bae6 100644
--- a/src/sbt-test/sbt-daffodil/builds-layer-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/builds-layer-01/build.sbt
@@ -21,6 +21,6 @@ val test = (project in file("."))
name := "test",
organization := "com.example",
daffodilVersion := "3.6.0",
- daffodilBuildsLayer := true,
+ daffodilBuildsLayer := true
)
.daffodilProject()
diff --git a/src/sbt-test/sbt-daffodil/builds-udf-01/build.sbt
b/src/sbt-test/sbt-daffodil/builds-udf-01/build.sbt
index 5ba1813..b79fea9 100644
--- a/src/sbt-test/sbt-daffodil/builds-udf-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/builds-udf-01/build.sbt
@@ -21,6 +21,6 @@ val test = (project in file("."))
name := "test",
organization := "com.example",
daffodilVersion := "3.6.0",
- daffodilBuildsUDF := true,
+ daffodilBuildsUDF := true
)
.daffodilProject()
diff --git a/src/sbt-test/sbt-daffodil/common-settings-01/build.sbt
b/src/sbt-test/sbt-daffodil/common-settings-01/build.sbt
index b30123b..a88f069 100644
--- a/src/sbt-test/sbt-daffodil/common-settings-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/common-settings-01/build.sbt
@@ -20,6 +20,6 @@ val test = (project in file("."))
version := "0.1",
name := "test",
organization := "com.example",
- daffodilVersion := "3.6.0",
+ daffodilVersion := "3.6.0"
)
.daffodilProject()
diff --git a/src/sbt-test/sbt-daffodil/cross-versions-01/build.sbt
b/src/sbt-test/sbt-daffodil/cross-versions-01/build.sbt
index 8b5c8b2..81f20ed 100644
--- a/src/sbt-test/sbt-daffodil/cross-versions-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/cross-versions-01/build.sbt
@@ -21,6 +21,6 @@ val test = (project in file("."))
version := "0.1",
organization := "com.example",
daffodilVersion := "3.10.0",
- daffodilBuildsLayer := true,
+ daffodilBuildsLayer := true
)
.daffodilProject(crossDaffodilVersions = Seq("3.11.0", "4.0.0"))
diff --git
a/src/sbt-test/sbt-daffodil/cross-versions-01/src/main/scala-daffodil-3.10.0/OnlyScala212.scala
b/src/sbt-test/sbt-daffodil/cross-versions-01/src/main/scala-daffodil-3.10.0/OnlyScala212.scala
index b491098..a02d753 100644
---
a/src/sbt-test/sbt-daffodil/cross-versions-01/src/main/scala-daffodil-3.10.0/OnlyScala212.scala
+++
b/src/sbt-test/sbt-daffodil/cross-versions-01/src/main/scala-daffodil-3.10.0/OnlyScala212.scala
@@ -19,5 +19,5 @@
// files. This code should only compile on Scala 2.12 (used by Daffodil 3.10.0)
object OnlyScala212 {
- val l: TraversableOnce[Int] = List(1,2,3)
+ val l: TraversableOnce[Int] = List(1, 2, 3)
}
diff --git
a/src/sbt-test/sbt-daffodil/cross-versions-01/src/main/scala/AllScala.scala
b/src/sbt-test/sbt-daffodil/cross-versions-01/src/main/scala/AllScala.scala
index 2678074..215a6e4 100644
--- a/src/sbt-test/sbt-daffodil/cross-versions-01/src/main/scala/AllScala.scala
+++ b/src/sbt-test/sbt-daffodil/cross-versions-01/src/main/scala/AllScala.scala
@@ -20,5 +20,5 @@
// Daffodil/Scala.
class AllScala {
- val xs = Seq(1,2,3)
+ val xs = Seq(1, 2, 3)
}
diff --git a/src/sbt-test/sbt-daffodil/cross-versions-02/build.sbt
b/src/sbt-test/sbt-daffodil/cross-versions-02/build.sbt
index 41d754d..af5b461 100644
--- a/src/sbt-test/sbt-daffodil/cross-versions-02/build.sbt
+++ b/src/sbt-test/sbt-daffodil/cross-versions-02/build.sbt
@@ -24,6 +24,6 @@ val test = (project in file("."))
DaffodilBinInfo("/com/example/test.dfdl.xsd")
),
daffodilTdmlUsesPackageBin := true,
- daffodilVersion := "3.10.0",
+ daffodilVersion := "3.10.0"
)
.daffodilProject(crossDaffodilVersions = Seq("3.11.0", "4.0.0"))
diff --git a/src/sbt-test/sbt-daffodil/cross-versions-03/build.sbt
b/src/sbt-test/sbt-daffodil/cross-versions-03/build.sbt
index f58ac2b..a375f76 100644
--- a/src/sbt-test/sbt-daffodil/cross-versions-03/build.sbt
+++ b/src/sbt-test/sbt-daffodil/cross-versions-03/build.sbt
@@ -23,7 +23,7 @@ val plugin = (project in file("plugin"))
version := "0.1",
organization := "com.example",
daffodilVersion := "3.10.0",
- daffodilBuildsCharset := true,
+ daffodilBuildsCharset := true
)
.daffodilProject(crossDaffodilVersions = Seq("3.11.0", "4.0.0"))
@@ -34,7 +34,7 @@ val schema = (project in file("schema"))
organization := "com.example",
daffodilVersion := "3.10.0",
libraryDependencies ++= Seq(
- "com.example" % "test-plugin" % "0.1"
daffodilPlugin(daffodilVersion.value)
+ ("com.example" % "test-plugin" %
"0.1").daffodilPlugin(daffodilVersion.value)
),
daffodilPackageBinInfos := Seq(
DaffodilBinInfo("/com/example/test.dfdl.xsd")
@@ -49,8 +49,8 @@ val bundle = (project in file("bundle"))
organization := "com.example",
daffodilVersion := "3.10.0",
libraryDependencies ++= Seq(
- "com.example" % "test-plugin" % "0.1"
daffodilPlugin(daffodilVersion.value),
- "com.example" % "test-schema" % "0.1" daffodilBin(daffodilVersion.value)
+ ("com.example" % "test-plugin" %
"0.1").daffodilPlugin(daffodilVersion.value),
+ ("com.example" % "test-schema" %
"0.1").daffodilBin(daffodilVersion.value)
),
Compile / resourceGenerators += Def.task {
// copy plugins and saved parsers to a "release" directory
@@ -63,4 +63,5 @@ val bundle = (project in file("bundle"))
}
destFiles
}.taskValue
- ).daffodilProject(crossDaffodilVersions = Seq("3.11.0", "4.0.0"))
+ )
+ .daffodilProject(crossDaffodilVersions = Seq("3.11.0", "4.0.0"))
diff --git
a/src/sbt-test/sbt-daffodil/cross-versions-03/plugin/src/main/scala/Test.scala
b/src/sbt-test/sbt-daffodil/cross-versions-03/plugin/src/main/scala/Test.scala
index de6a134..32a5109 100644
---
a/src/sbt-test/sbt-daffodil/cross-versions-03/plugin/src/main/scala/Test.scala
+++
b/src/sbt-test/sbt-daffodil/cross-versions-03/plugin/src/main/scala/Test.scala
@@ -18,5 +18,5 @@
// Not an actual layer. This is only used to show plugins can be published and
resolved
class Test {
- val xs = Seq(1,2,3)
+ val xs = Seq(1, 2, 3)
}
diff --git a/src/sbt-test/sbt-daffodil/flat-layout-01/build.sbt
b/src/sbt-test/sbt-daffodil/flat-layout-01/build.sbt
index 576bfab..9b4f557 100644
--- a/src/sbt-test/sbt-daffodil/flat-layout-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/flat-layout-01/build.sbt
@@ -21,6 +21,6 @@ val test = (project in file("."))
name := "test",
organization := "com.example",
daffodilVersion := "3.6.0",
- daffodilFlatLayout := true,
+ daffodilFlatLayout := true
)
.daffodilProject()
diff --git a/src/sbt-test/sbt-daffodil/saved-parsers-01/build.sbt
b/src/sbt-test/sbt-daffodil/saved-parsers-01/build.sbt
index ac10a59..02e1e77 100644
--- a/src/sbt-test/sbt-daffodil/saved-parsers-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/saved-parsers-01/build.sbt
@@ -24,6 +24,6 @@ val test = (project in file("."))
DaffodilBinInfo("/test.dfdl.xsd"),
DaffodilBinInfo("/test.dfdl.xsd", Some("test02"), Some("two"))
),
- daffodilVersion := "3.6.0",
+ daffodilVersion := "3.6.0"
)
.daffodilProject(crossDaffodilVersions = Seq("3.5.0"))
diff --git a/src/sbt-test/sbt-daffodil/saved-parsers-02/build.sbt
b/src/sbt-test/sbt-daffodil/saved-parsers-02/build.sbt
index 8076bf7..ea4fe60 100644
--- a/src/sbt-test/sbt-daffodil/saved-parsers-02/build.sbt
+++ b/src/sbt-test/sbt-daffodil/saved-parsers-02/build.sbt
@@ -25,6 +25,6 @@ val test = (project in file("."))
("/test.dfdl.xsd", None, None),
("/test.dfdl.xsd", Some("test02"), Some("two"))
),
- daffodilVersion := "3.6.0",
+ daffodilVersion := "3.6.0"
)
.daffodilProject(crossDaffodilVersions = Seq("3.5.0"))
diff --git a/src/sbt-test/sbt-daffodil/saved-parsers-03/build.sbt
b/src/sbt-test/sbt-daffodil/saved-parsers-03/build.sbt
index 77f4ad6..f247366 100644
--- a/src/sbt-test/sbt-daffodil/saved-parsers-03/build.sbt
+++ b/src/sbt-test/sbt-daffodil/saved-parsers-03/build.sbt
@@ -27,6 +27,6 @@ val test = (project in file("."))
DaffodilBinInfo("/test.dfdl.xsd", Some("test02"), Some("two"), config
= config)
)
},
- daffodilVersion := "3.11.0",
+ daffodilVersion := "3.11.0"
)
.daffodilProject(crossDaffodilVersions = Seq("3.5.0"))
diff --git a/src/sbt-test/sbt-daffodil/saved-parsers-04/build.sbt
b/src/sbt-test/sbt-daffodil/saved-parsers-04/build.sbt
index a19ed81..84682d6 100644
--- a/src/sbt-test/sbt-daffodil/saved-parsers-04/build.sbt
+++ b/src/sbt-test/sbt-daffodil/saved-parsers-04/build.sbt
@@ -22,6 +22,6 @@ val test = (project in file("."))
organization := "com.example",
daffodilPackageBinInfos := Seq(
DaffodilBinInfo("/does-not-exist.dfdl.xsd")
- ),
+ )
)
.daffodilProject()
diff --git a/src/sbt-test/sbt-daffodil/saved-parsers-05/build.sbt
b/src/sbt-test/sbt-daffodil/saved-parsers-05/build.sbt
index 9c8a503..4481118 100644
--- a/src/sbt-test/sbt-daffodil/saved-parsers-05/build.sbt
+++ b/src/sbt-test/sbt-daffodil/saved-parsers-05/build.sbt
@@ -28,6 +28,6 @@ val test = (project in file("."))
DaffodilBinInfo("/test.dfdl.xsd"),
DaffodilBinInfo("/test.dfdl.xsd", Some("test02"), Some("two"))
),
- daffodilVersion := "3.6.0",
+ daffodilVersion := "3.6.0"
)
.daffodilProject(crossDaffodilVersions = Seq("3.5.0"))
diff --git a/src/sbt-test/sbt-daffodil/saved-parsers-06/build.sbt
b/src/sbt-test/sbt-daffodil/saved-parsers-06/build.sbt
index 2035bda..4aed897 100644
--- a/src/sbt-test/sbt-daffodil/saved-parsers-06/build.sbt
+++ b/src/sbt-test/sbt-daffodil/saved-parsers-06/build.sbt
@@ -24,6 +24,6 @@ val test = (project in file("."))
daffodilPackageBinInfos := Seq(
DaffodilBinInfo("/test.dfdl.xsd")
),
- daffodilVersion := "3.6.0",
+ daffodilVersion := "3.6.0"
)
.daffodilProject()
diff --git a/src/sbt-test/sbt-daffodil/tdml-junit-01/build.sbt
b/src/sbt-test/sbt-daffodil/tdml-junit-01/build.sbt
index 743f70a..e1c7370 100644
--- a/src/sbt-test/sbt-daffodil/tdml-junit-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/tdml-junit-01/build.sbt
@@ -19,6 +19,6 @@ val test = (project in file("."))
.settings(
version := "0.1",
name := "test",
- organization := "com.example",
+ organization := "com.example"
)
.daffodilProject()
diff --git a/src/sbt-test/sbt-daffodil/tdml-saved-parser-01/build.sbt
b/src/sbt-test/sbt-daffodil/tdml-saved-parser-01/build.sbt
index b11de33..ddd6fff 100644
--- a/src/sbt-test/sbt-daffodil/tdml-saved-parser-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/tdml-saved-parser-01/build.sbt
@@ -25,6 +25,6 @@ val test = (project in file("."))
DaffodilBinInfo("/com/example/test.dfdl.xsd"),
DaffodilBinInfo("/com/example/test.dfdl.xsd", Some("test02"),
Some("two"))
),
- daffodilTdmlUsesPackageBin := true,
+ daffodilTdmlUsesPackageBin := true
)
.daffodilProject(crossDaffodilVersions = Seq("3.5.0"))
diff --git a/src/sbt-test/sbt-daffodil/versions-01/build.sbt
b/src/sbt-test/sbt-daffodil/versions-01/build.sbt
index aa8e475..4db5f65 100644
--- a/src/sbt-test/sbt-daffodil/versions-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/versions-01/build.sbt
@@ -22,6 +22,6 @@ val test = (project in file("."))
organization := "com.example",
daffodilPackageBinInfos := Seq(
DaffodilBinInfo("/com/example/test.dfdl.xsd")
- ),
+ )
)
.daffodilProject()
