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 4037e7e Update scalafmt-core to 3.8.3
4037e7e is described below
commit 4037e7ebe92ce542aa7c91719c35f0bf9bc1508b
Author: Scala Steward <[email protected]>
AuthorDate: Mon Nov 4 08:05:56 2024 -0500
Update scalafmt-core to 3.8.3
Also update the config to match Daffodil's config, and rerun scalafmt
---
.scalafmt.conf | 4 +-
build.sbt | 10 ++---
.../scala/org/apache/daffodil/DaffodilPlugin.scala | 50 +++++++++++-----------
.../scala/org/apache/daffodil/DaffodilSaver.scala | 4 +-
.../src/main/scala/com/example/charset.scala | 4 +-
.../src/main/scala/com/example/layer.scala | 4 +-
.../src/main/scala/com/example/udf.scala | 4 +-
.../src/test/scala/com/example/test.scala | 3 +-
.../sbt-daffodil/flat-layout-01/test/test.scala | 3 +-
.../sbt-daffodil/saved-parsers-01/build.sbt | 2 +-
.../sbt-daffodil/saved-parsers-02/build.sbt | 2 +-
.../sbt-daffodil/saved-parsers-03/build.sbt | 11 +++--
.../sbt-daffodil/saved-parsers-05/build.sbt | 2 +-
.../sbt-daffodil/saved-parsers-06/build.sbt | 2 +-
.../sbt-daffodil/tdml-saved-parser-01/build.sbt | 2 +-
.../src/test/scala/com/example/test.scala | 3 +-
src/sbt-test/sbt-daffodil/versions-01/build.sbt | 2 +-
.../src/test/scala/com/example/test.scala | 3 +-
18 files changed, 58 insertions(+), 57 deletions(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index d020090..a6ac4e0 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -29,7 +29,7 @@ rewrite.rules = [
AvoidInfix,
Imports,
]
-rewrite.trailingCommas.style = always
+rewrite.trailingCommas.style = never
runner.dialect = scala212
spaces.inImportCurlyBraces = true
-version = 3.7.17
+version = 3.8.3
diff --git a/build.sbt b/build.sbt
index 7b6abb9..8a401a7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -24,14 +24,14 @@ version := "1.2.0-SNAPSHOT"
scalaVersion := "2.12.19"
scalacOptions ++= Seq(
- "-Ywarn-unused:imports",
+ "-Ywarn-unused:imports"
)
scmInfo := Some(
ScmInfo(
browseUrl = url("https://github.com/apache/daffodil-sbt";),
- connection = "scm:git:https://github.com/apache/daffodil-sbt";,
- ),
+ connection = "scm:git:https://github.com/apache/daffodil-sbt";
+ )
)
licenses := Seq(License.Apache2)
@@ -48,13 +48,13 @@ crossSbtVersions := Seq("1.8.0")
scriptedLaunchOpts ++= Seq(
"-Xmx1024M",
- "-Dplugin.version=" + version.value,
+ "-Dplugin.version=" + version.value
)
// Rat check settings
ratExcludes := Seq(
- file(".git"),
+ file(".git")
)
ratFailBinaries := true
diff --git a/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala
b/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala
index df36566..ed84952 100644
--- a/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala
+++ b/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala
@@ -28,31 +28,31 @@ object DaffodilPlugin extends AutoPlugin {
object autoImport {
val daffodilPackageBinInfos = settingKey[Seq[DaffodilBinInfo]](
- "Information used to create compiled parsers",
+ "Information used to create compiled parsers"
)
val daffodilPackageBinVersions = settingKey[Seq[String]](
- "Versions of daffodil to create saved parsers for",
+ "Versions of daffodil to create saved parsers for"
)
val packageDaffodilBin = taskKey[Seq[File]](
- "Package daffodil saved parsers",
+ "Package daffodil saved parsers"
)
val daffodilVersion = settingKey[String](
- "Version of daffodil to add as a dependency",
+ "Version of daffodil to add as a dependency"
)
val daffodilBuildsCharset = settingKey[Boolean](
- "Whether or not the project builds a charset",
+ "Whether or not the project builds a charset"
)
val daffodilBuildsLayer = settingKey[Boolean](
- "Whether or not the project builds a layer",
+ "Whether or not the project builds a layer"
)
val daffodilBuildsUDF = settingKey[Boolean](
- "Whether or not the project builds a user defined function",
+ "Whether or not the project builds a user defined function"
)
val daffodilFlatLayout = settingKey[Boolean](
- "Whether or not to use a flat schema project layout that uses src/ and
test/ root directories containing a mix of sources and resources",
+ "Whether or not to use a flat schema project layout that uses src/ and
test/ root directories containing a mix of sources and resources"
)
val daffodilTdmlUsesPackageBin = settingKey[Boolean](
- "Whether or not TDML files use the saved parsers created by
daffodilPackageBin",
+ "Whether or not TDML files use the saved parsers created by
daffodilPackageBin"
)
/**
@@ -62,7 +62,7 @@ object DaffodilPlugin extends AutoPlugin {
schema: String,
root: Option[String] = None,
name: Option[String] = None,
- config: Option[File] = None,
+ config: Option[File] = None
)
/**
@@ -73,7 +73,7 @@ object DaffodilPlugin extends AutoPlugin {
DaffodilBinInfo(
schema = t._1,
root = t._2,
- name = t._3,
+ name = t._3
)
}
}
@@ -137,7 +137,7 @@ object DaffodilPlugin extends AutoPlugin {
">=21 <22" -> "2.12.18",
">=17 <21" -> "2.12.15",
">=11 <17" -> "2.12.4",
- " <11" -> "2.12.0",
+ " <11" -> "2.12.0"
)
val daffodilScalaVersionMapping = Map(
@@ -146,7 +146,7 @@ object DaffodilPlugin extends AutoPlugin {
">=3.4.0 <3.5.0" -> "2.12.17",
">=3.2.0 <3.4.0" -> "2.12.15",
">=3.1.0 <3.2.0" -> "2.12.13",
- " <3.1.0" -> "2.12.11",
+ " <3.1.0" -> "2.12.11"
)
val dafScalaVersion =
@@ -186,12 +186,12 @@ object DaffodilPlugin extends AutoPlugin {
">=3.0.0" -> Seq(
"org.apache.daffodil" %% "daffodil-tdml-processor" %
daffodilVersion.value % "test",
"junit" % "junit" % "4.13.2" % "test",
- "com.github.sbt" % "junit-interface" % "0.13.2" % "test",
+ "com.github.sbt" % "junit-interface" % "0.13.2" % "test"
),
// Add log4j with older versions of Daffodil to silence warnings about
missing loggers
">=3.2.0 <=3.4.0" -> Seq(
- "org.apache.logging.log4j" % "log4j-core" % "2.20.0" % "test",
- ),
+ "org.apache.logging.log4j" % "log4j-core" % "2.20.0" % "test"
+ )
)
val dependencies = filterVersions(daffodilVersion.value,
versionedDeps).flatten
dependencies
@@ -214,7 +214,7 @@ object DaffodilPlugin extends AutoPlugin {
libraryDependencies ++= {
if (daffodilBuildsLayer.value) {
Seq(
- "org.apache.daffodil" %% "daffodil-runtime1-layers" %
daffodilVersion.value % "provided",
+ "org.apache.daffodil" %% "daffodil-runtime1-layers" %
daffodilVersion.value % "provided"
)
} else {
Seq()
@@ -274,7 +274,7 @@ object DaffodilPlugin extends AutoPlugin {
// actually output logs that we care about, so this doesn't really
matter
val logMappings = Map(
">=3.5.0" -> "org.slf4j" % "slf4j-nop" % "2.0.9" % cfg,
- "<3.5.0" -> "org.apache.logging.log4j" % "log4j-core" % "2.20.0" %
cfg,
+ "<3.5.0" -> "org.apache.logging.log4j" % "log4j-core" % "2.20.0" %
cfg
)
val logDep = filterVersions(binDaffodilVersion, logMappings).head
Seq(dafDep, logDep)
@@ -359,7 +359,7 @@ object DaffodilPlugin extends AutoPlugin {
if (!dbi.schema.startsWith("/")) {
throw new MessageOnlyException(
- s"daffodilPackageBinInfos schema must be a resource path that
starts with '/': ${dbi.schema}",
+ s"daffodilPackageBinInfos schema must be a resource path that
starts with '/': ${dbi.schema}"
)
}
@@ -373,7 +373,7 @@ object DaffodilPlugin extends AutoPlugin {
// used for a particular "internal API"
val daffodilInternalApiVersionMapping = Map(
">3.8.0" -> "2",
- "<=3.8.0" -> "1",
+ "<=3.8.0" -> "1"
)
val internalApiVersion =
filterVersions(daffodilVersion,
daffodilInternalApiVersionMapping).head
@@ -386,7 +386,7 @@ object DaffodilPlugin extends AutoPlugin {
dbi.schema,
targetFile.toString,
dbi.root.getOrElse(""),
- dbi.config.map { _.toString }.getOrElse(""),
+ dbi.config.map { _.toString }.getOrElse("")
)
logger.info(s"compiling daffodil parser to ${targetFile} ...")
@@ -416,7 +416,7 @@ object DaffodilPlugin extends AutoPlugin {
// parser files but do not want this warning should access
// (packageDaffodilBin / products).value instead of
packageDaffodilBin.value
logger.warn(
- "no saved parsers created--one or both of daffodilPackageBinInfos
and daffodilPackageBinVersions are empty",
+ "no saved parsers created--one or both of daffodilPackageBinInfos
and daffodilPackageBinVersions are empty"
)
}
prods
@@ -464,7 +464,7 @@ object DaffodilPlugin extends AutoPlugin {
if (!daffodilPackageBinVersions.value.contains(daffodilVersion.value))
{
throw new MessageOnlyException(
- s"daffodilPackageBinVersions
(${daffodilPackageBinVersions.value.mkString(", ")}) must contain
daffodilVersion (${daffodilVersion.value}) if daffodilTdmlUsesPackageBin is
true",
+ s"daffodilPackageBinVersions
(${daffodilPackageBinVersions.value.mkString(", ")}) must contain
daffodilVersion (${daffodilVersion.value}) if daffodilTdmlUsesPackageBin is
true"
)
}
@@ -506,7 +506,7 @@ object DaffodilPlugin extends AutoPlugin {
} else {
existingMappings
}
- },
+ }
) ++
inConfig(Compile)(flatLayoutSettings("src")) ++
inConfig(Test)(flatLayoutSettings("test"))
@@ -545,7 +545,7 @@ object DaffodilPlugin extends AutoPlugin {
unmanagedResources / excludeFilter := {
if (!daffodilFlatLayout.value) (unmanagedResources / excludeFilter).value
else (unmanagedSources / includeFilter).value,
- },
+ }
)
/**
diff --git a/src/main/scala/org/apache/daffodil/DaffodilSaver.scala
b/src/main/scala/org/apache/daffodil/DaffodilSaver.scala
index 7540a48..ede1dad 100644
--- a/src/main/scala/org/apache/daffodil/DaffodilSaver.scala
+++ b/src/main/scala/org/apache/daffodil/DaffodilSaver.scala
@@ -42,7 +42,7 @@ object DaffodilSaver {
assert(
args.length == 5,
- "DaffodilPlugin did not provide the correct number of arguments when
forking DaffodilSaver",
+ "DaffodilPlugin did not provide the correct number of arguments when
forking DaffodilSaver"
)
// the "version" of the Daffodil API to use. Note that this is not the
same as the Daffodil
@@ -59,7 +59,7 @@ object DaffodilSaver {
val output = FileChannel.open(
Paths.get(args(2)),
StandardOpenOption.CREATE,
- StandardOpenOption.WRITE,
+ StandardOpenOption.WRITE
)
val root = if (args(3) != "") args(3) else null
val config = if (args(4) != "") args(4) else null
diff --git
a/src/sbt-test/sbt-daffodil/builds-charset-01/src/main/scala/com/example/charset.scala
b/src/sbt-test/sbt-daffodil/builds-charset-01/src/main/scala/com/example/charset.scala
index 2441a32..1b5996c 100644
---
a/src/sbt-test/sbt-daffodil/builds-charset-01/src/main/scala/com/example/charset.scala
+++
b/src/sbt-test/sbt-daffodil/builds-charset-01/src/main/scala/com/example/charset.scala
@@ -21,6 +21,4 @@ import
org.apache.daffodil.io.processors.charset.BitsCharsetDefinition
// this is not a real charset, but the above import will fail to compile if
daffodil-io (which
// contains the Daffodil charset API is not on the compile classpath
-class TestCharset {
-}
-
+class TestCharset {}
diff --git
a/src/sbt-test/sbt-daffodil/builds-layer-01/src/main/scala/com/example/layer.scala
b/src/sbt-test/sbt-daffodil/builds-layer-01/src/main/scala/com/example/layer.scala
index 9d82359..4fb87ba 100644
---
a/src/sbt-test/sbt-daffodil/builds-layer-01/src/main/scala/com/example/layer.scala
+++
b/src/sbt-test/sbt-daffodil/builds-layer-01/src/main/scala/com/example/layer.scala
@@ -21,6 +21,4 @@ import org.apache.daffodil.runtime1.layers.LayerCompiler
// this is not a real layer, but the above import will fail to compile if
// daffodil-runtime1-layers is not on the compile classpath
-class TestLayer {
-}
-
+class TestLayer {}
diff --git
a/src/sbt-test/sbt-daffodil/builds-udf-01/src/main/scala/com/example/udf.scala
b/src/sbt-test/sbt-daffodil/builds-udf-01/src/main/scala/com/example/udf.scala
index 8d820e6..64185d2 100644
---
a/src/sbt-test/sbt-daffodil/builds-udf-01/src/main/scala/com/example/udf.scala
+++
b/src/sbt-test/sbt-daffodil/builds-udf-01/src/main/scala/com/example/udf.scala
@@ -21,6 +21,4 @@ import org.apache.daffodil.udf.UserDefinedFunction
// this is not a real udf, but the above import will fail to compile if
daffodil-udf is not on
// the compile classpath
-class TestUDF {
-}
-
+class TestUDF {}
diff --git
a/src/sbt-test/sbt-daffodil/common-settings-01/src/test/scala/com/example/test.scala
b/src/sbt-test/sbt-daffodil/common-settings-01/src/test/scala/com/example/test.scala
index 85e2848..b9e6caf 100644
---
a/src/sbt-test/sbt-daffodil/common-settings-01/src/test/scala/com/example/test.scala
+++
b/src/sbt-test/sbt-daffodil/common-settings-01/src/test/scala/com/example/test.scala
@@ -17,9 +17,10 @@
package com.example
-import org.junit.Test
import org.apache.daffodil.tdml.Runner
+
import org.junit.AfterClass
+import org.junit.Test
object TestExample {
lazy val runner = Runner("/com/example/", "test.tdml")
diff --git a/src/sbt-test/sbt-daffodil/flat-layout-01/test/test.scala
b/src/sbt-test/sbt-daffodil/flat-layout-01/test/test.scala
index 6f8f20d..ef65a61 100644
--- a/src/sbt-test/sbt-daffodil/flat-layout-01/test/test.scala
+++ b/src/sbt-test/sbt-daffodil/flat-layout-01/test/test.scala
@@ -17,9 +17,10 @@
package com.example
-import org.junit.Test
import org.apache.daffodil.tdml.Runner
+
import org.junit.AfterClass
+import org.junit.Test
object TestExample {
lazy val runner = Runner("/", "test.tdml")
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 ea1a7a4..0e5c256 100644
--- a/src/sbt-test/sbt-daffodil/saved-parsers-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/saved-parsers-01/build.sbt
@@ -25,7 +25,7 @@ enablePlugins(DaffodilPlugin)
daffodilPackageBinInfos := Seq(
DaffodilBinInfo("/test.dfdl.xsd"),
- DaffodilBinInfo("/test.dfdl.xsd", Some("test02"), Some("two")),
+ DaffodilBinInfo("/test.dfdl.xsd", Some("test02"), Some("two"))
)
daffodilPackageBinVersions := Seq("3.6.0", "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 6c673b8..73606e4 100644
--- a/src/sbt-test/sbt-daffodil/saved-parsers-02/build.sbt
+++ b/src/sbt-test/sbt-daffodil/saved-parsers-02/build.sbt
@@ -26,7 +26,7 @@ enablePlugins(DaffodilPlugin)
// same as saved-parsers-01 but uses the old tuple syntax
daffodilPackageBinInfos := Seq(
("/test.dfdl.xsd", None, None),
- ("/test.dfdl.xsd", Some("test02"), Some("two")),
+ ("/test.dfdl.xsd", Some("test02"), Some("two"))
)
daffodilPackageBinVersions := Seq("3.6.0", "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 17d1ed2..163bce5 100644
--- a/src/sbt-test/sbt-daffodil/saved-parsers-03/build.sbt
+++ b/src/sbt-test/sbt-daffodil/saved-parsers-03/build.sbt
@@ -23,10 +23,13 @@ organization := "com.example"
enablePlugins(DaffodilPlugin)
-daffodilPackageBinInfos := Seq(
- DaffodilBinInfo("/test.dfdl.xsd", config = Some((Compile /
resourceDirectory).value / "test.cfg")),
- DaffodilBinInfo("/test.dfdl.xsd", Some("test02"), Some("two"), config =
Some((Compile / resourceDirectory).value / "test.cfg")),
-)
+daffodilPackageBinInfos := {
+ val config = Some((Compile / resourceDirectory).value / "test.cfg")
+ Seq(
+ DaffodilBinInfo("/test.dfdl.xsd", config = config),
+ DaffodilBinInfo("/test.dfdl.xsd", Some("test02"), Some("two"), config =
config)
+ )
+}
daffodilPackageBinVersions := Seq("3.6.0", "3.5.0")
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 d0f9e7d..bcd6692 100644
--- a/src/sbt-test/sbt-daffodil/saved-parsers-05/build.sbt
+++ b/src/sbt-test/sbt-daffodil/saved-parsers-05/build.sbt
@@ -30,7 +30,7 @@ enablePlugins(DaffodilPlugin)
daffodilPackageBinInfos := Seq(
DaffodilBinInfo("/test.dfdl.xsd"),
- DaffodilBinInfo("/test.dfdl.xsd", Some("test02"), Some("two")),
+ DaffodilBinInfo("/test.dfdl.xsd", Some("test02"), Some("two"))
)
daffodilPackageBinVersions := Seq("3.6.0", "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 f744b3b..85c5e0b 100644
--- a/src/sbt-test/sbt-daffodil/saved-parsers-06/build.sbt
+++ b/src/sbt-test/sbt-daffodil/saved-parsers-06/build.sbt
@@ -26,7 +26,7 @@ enablePlugins(DaffodilPlugin)
packageDaffodilBin / javaOptions ++= Seq("-XshouldErrorIfUsed")
daffodilPackageBinInfos := Seq(
- DaffodilBinInfo("/test.dfdl.xsd"),
+ DaffodilBinInfo("/test.dfdl.xsd")
)
daffodilPackageBinVersions := Seq("3.6.0")
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 14d4cb4..45a6902 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,7 +25,7 @@ enablePlugins(DaffodilPlugin)
daffodilPackageBinInfos := Seq(
DaffodilBinInfo("/com/example/test.dfdl.xsd"),
- DaffodilBinInfo("/com/example/test.dfdl.xsd", Some("test02"), Some("two")),
+ DaffodilBinInfo("/com/example/test.dfdl.xsd", Some("test02"), Some("two"))
)
daffodilPackageBinVersions := Seq("3.6.0", "3.5.0")
diff --git
a/src/sbt-test/sbt-daffodil/tdml-saved-parser-01/src/test/scala/com/example/test.scala
b/src/sbt-test/sbt-daffodil/tdml-saved-parser-01/src/test/scala/com/example/test.scala
index a2550a5..6c1e82a 100644
---
a/src/sbt-test/sbt-daffodil/tdml-saved-parser-01/src/test/scala/com/example/test.scala
+++
b/src/sbt-test/sbt-daffodil/tdml-saved-parser-01/src/test/scala/com/example/test.scala
@@ -17,9 +17,10 @@
package com.example
-import org.junit.Test
import org.apache.daffodil.tdml.Runner
+
import org.junit.AfterClass
+import org.junit.Test
object TestExample {
lazy val runner = Runner("/com/example/", "test.tdml")
diff --git a/src/sbt-test/sbt-daffodil/versions-01/build.sbt
b/src/sbt-test/sbt-daffodil/versions-01/build.sbt
index 884d8aa..a907294 100644
--- a/src/sbt-test/sbt-daffodil/versions-01/build.sbt
+++ b/src/sbt-test/sbt-daffodil/versions-01/build.sbt
@@ -24,7 +24,7 @@ organization := "com.example"
enablePlugins(DaffodilPlugin)
daffodilPackageBinInfos := Seq(
- DaffodilBinInfo("/com/example/test.dfdl.xsd"),
+ DaffodilBinInfo("/com/example/test.dfdl.xsd")
)
daffodilPackageBinVersions := Seq(daffodilVersion.value)
diff --git
a/src/sbt-test/sbt-daffodil/versions-01/src/test/scala/com/example/test.scala
b/src/sbt-test/sbt-daffodil/versions-01/src/test/scala/com/example/test.scala
index 85e2848..b9e6caf 100644
---
a/src/sbt-test/sbt-daffodil/versions-01/src/test/scala/com/example/test.scala
+++
b/src/sbt-test/sbt-daffodil/versions-01/src/test/scala/com/example/test.scala
@@ -17,9 +17,10 @@
package com.example
-import org.junit.Test
import org.apache.daffodil.tdml.Runner
+
import org.junit.AfterClass
+import org.junit.Test
object TestExample {
lazy val runner = Runner("/com/example/", "test.tdml")
