From 2940f7a3d77c77a6f65f1bb17996f498995f53d3 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 16 Jan 2025 16:20:19 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.4 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 91e7c64b..0b2d6c55 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,5 +1,5 @@ # Test upgrades: $ scripts/scalafmt --test 2> diff.txt -version = 3.8.3 +version = 3.8.4 runner.dialect = scala213source3 preset = default From 7674b8eb48dc8e33debb1acad4365364b8c12d5a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 16 Jan 2025 16:20:35 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.4 Executed command: scalafmt --non-interactive --- .../shared/src/main/scala/org/ekrich/config/Config.scala | 8 ++++---- .../src/main/scala/org/ekrich/config/ConfigFactory.scala | 4 ++-- .../src/main/scala/org/ekrich/config/ConfigList.scala | 2 +- .../src/main/scala/org/ekrich/config/ConfigObject.scala | 2 +- .../src/main/scala/org/ekrich/config/ConfigOrigin.scala | 8 ++++---- .../src/main/scala/org/ekrich/config/ConfigValue.scala | 2 +- .../scala/org/ekrich/config/parser/ConfigDocument.scala | 2 +- .../main/scala/org/ekrich/config/parser/ConfigNode.scala | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/Config.scala b/sconfig/shared/src/main/scala/org/ekrich/config/Config.scala index 7920d783..72efd153 100644 --- a/sconfig/shared/src/main/scala/org/ekrich/config/Config.scala +++ b/sconfig/shared/src/main/scala/org/ekrich/config/Config.scala @@ -63,7 +63,7 @@ import scala.annotation.varargs * path expressions and individual path elements (keys). * *

Another difference between `Config` and `ConfigObject` is that - * conceptually, `ConfigValue`s with a [[ConfigValue#valueType valueType]] of + * conceptually, `ConfigValue` s with a [[ConfigValue#valueType valueType]] of * [[ConfigValueType#NULL NULL]] exist in a `ConfigObject`, while a `Config` * treats null values as if they were missing. (With the exception of two * methods: [[Config#hasPathOrNull]] and [[Config#getIsNull]] let you detect @@ -137,7 +137,7 @@ import scala.annotation.varargs * *

This is an interface but don't implement it yourself * - *

Do not implement `Config`; it should only be implemented by the + *

Do not implement `Config` ; it should only be implemented by the * config library. Arbitrary implementations will not work because the library * internals assume a specific concrete implementation. Also, this interface is * likely to grow new methods over time, so third-party implementations will @@ -303,7 +303,7 @@ trait Config extends ConfigMergeable { * validate them. Also, if every module validates only its own stuff, there * isn't as much redundant work being done. * - *

If no paths are specified in `checkValid`'s parameter list, validation + *

If no paths are specified in `checkValid` 's parameter list, validation * is for the entire config. * *

If you specify paths that are not in the reference config, those paths @@ -420,7 +420,7 @@ trait Config extends ConfigMergeable { def hasPathOrNull(path: String): Boolean /** - * Returns true if the `Config`'s root object contains no key-value pairs. + * Returns true if the `Config` 's root object contains no key-value pairs. * * @return * true if the configuration is empty diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/ConfigFactory.scala b/sconfig/shared/src/main/scala/org/ekrich/config/ConfigFactory.scala index be0636ef..38810fc1 100644 --- a/sconfig/shared/src/main/scala/org/ekrich/config/ConfigFactory.scala +++ b/sconfig/shared/src/main/scala/org/ekrich/config/ConfigFactory.scala @@ -750,7 +750,7 @@ object ConfigFactory extends PlatformConfigFactory { * `klass.getClassLoader()` will be used to load resources, and non-absolute * resource names will have this class's package added * @param resource - * resource to look up, relative to `klass`'s package or absolute starting + * resource to look up, relative to `klass` 's package or absolute starting * with a "/" * @param options * parse options @@ -773,7 +773,7 @@ object ConfigFactory extends PlatformConfigFactory { * `klass.getClassLoader()` will be used to load resources, and non-absolute * resource names will have this class's package added * @param resource - * resource to look up, relative to `klass`'s package or absolute starting + * resource to look up, relative to `klass` 's package or absolute starting * with a "/" * @return * the parsed configuration diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/ConfigList.scala b/sconfig/shared/src/main/scala/org/ekrich/config/ConfigList.scala index e2a24e0a..a7d97ca4 100644 --- a/sconfig/shared/src/main/scala/org/ekrich/config/ConfigList.scala +++ b/sconfig/shared/src/main/scala/org/ekrich/config/ConfigList.scala @@ -21,7 +21,7 @@ import java.{util => ju} *

The [[ConfigValue#valueType]] method on a list returns * [[ConfigValueType#LIST]]. * - *

Do not implement `ConfigList`; it should only be implemented by + *

Do not implement `ConfigList` ; it should only be implemented by * the config library. Arbitrary implementations will not work because the * library internals assume a specific concrete implementation. Also, this * interface is likely to grow new methods over time, so third-party diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/ConfigObject.scala b/sconfig/shared/src/main/scala/org/ekrich/config/ConfigObject.scala index 60d8cae4..643adc20 100644 --- a/sconfig/shared/src/main/scala/org/ekrich/config/ConfigObject.scala +++ b/sconfig/shared/src/main/scala/org/ekrich/config/ConfigObject.scala @@ -44,7 +44,7 @@ import java.{util => ju} * a [[ConfigValue]] with type `ConfigValueType#NULL` then the key was set to * null explicitly in the config file. * - *

Do not implement interface `ConfigObject`; it should only be + *

Do not implement interface `ConfigObject` ; it should only be * implemented by the config library. Arbitrary implementations will not work * because the library internals assume a specific concrete implementation. * Also, this interface is likely to grow new methods over time, so third-party diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/ConfigOrigin.scala b/sconfig/shared/src/main/scala/org/ekrich/config/ConfigOrigin.scala index 1377ebf0..405876c9 100644 --- a/sconfig/shared/src/main/scala/org/ekrich/config/ConfigOrigin.scala +++ b/sconfig/shared/src/main/scala/org/ekrich/config/ConfigOrigin.scala @@ -85,9 +85,9 @@ trait ConfigOrigin { /** * Returns a `ConfigOrigin` based on this one, but with the given comments. - * Does not modify this instance or any `ConfigValue`s with this origin (since - * they are immutable). To set the returned origin to a `ConfigValue`, use - * [[ConfigValue#withOrigin]]. + * Does not modify this instance or any `ConfigValue` s with this origin + * (since they are immutable). To set the returned origin to a `ConfigValue`, + * use [[ConfigValue#withOrigin]]. * *

Note that when the given comments are equal to the comments on this * object, a new instance may not be created and `this` is returned directly. @@ -103,7 +103,7 @@ trait ConfigOrigin { /** * Returns a `ConfigOrigin` based on this one, but with the given line number. * This origin must be a FILE, URL or RESOURCE. Does not modify this instance - * or any `ConfigValue`s with this origin (since they are immutable). To set + * or any `ConfigValue` s with this origin (since they are immutable). To set * the returned origin to a `ConfigValue`, use [[ConfigValue#withOrigin]]. * *

Note that when the given lineNumber are equal to the lineNumber on this diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/ConfigValue.scala b/sconfig/shared/src/main/scala/org/ekrich/config/ConfigValue.scala index d0166ebe..d0434040 100644 --- a/sconfig/shared/src/main/scala/org/ekrich/config/ConfigValue.scala +++ b/sconfig/shared/src/main/scala/org/ekrich/config/ConfigValue.scala @@ -10,7 +10,7 @@ package org.ekrich.config *

Because this object is immutable, it is safe to use from multiple threads * and there's no need for "defensive copies." * - *

Do not implement interface `ConfigValue`; it should only be + *

Do not implement interface `ConfigValue` ; it should only be * implemented by the config library. Arbitrary implementations will not work * because the library internals assume a specific concrete implementation. * Also, this interface is likely to grow new methods over time, so third-party diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/parser/ConfigDocument.scala b/sconfig/shared/src/main/scala/org/ekrich/config/parser/ConfigDocument.scala index 624f9961..911ea26f 100644 --- a/sconfig/shared/src/main/scala/org/ekrich/config/parser/ConfigDocument.scala +++ b/sconfig/shared/src/main/scala/org/ekrich/config/parser/ConfigDocument.scala @@ -10,7 +10,7 @@ import org.ekrich.config.ConfigValue *

Because this object is immutable, it is safe to use from multiple threads * and there's no need for "defensive copies." * - *

Do not implement interface `ConfigDocument`; it should only be + *

Do not implement interface `ConfigDocument` ; it should only be * implemented by the config library. Arbitrary implementations will not work * because the library internals assume a specific concrete implementation. * Also, this interface is likely to grow new methods over time, so third-party diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/parser/ConfigNode.scala b/sconfig/shared/src/main/scala/org/ekrich/config/parser/ConfigNode.scala index 6983df04..92a55f32 100644 --- a/sconfig/shared/src/main/scala/org/ekrich/config/parser/ConfigNode.scala +++ b/sconfig/shared/src/main/scala/org/ekrich/config/parser/ConfigNode.scala @@ -15,7 +15,7 @@ package org.ekrich.config.parser *

Because this object is immutable, it is safe to use from multiple threads * and there's no need for "defensive copies." * - *

Do not implement interface `ConfigNode`; it should only be + *

Do not implement interface `ConfigNode` ; it should only be * implemented by the config library. Arbitrary implementations will not work * because the library internals assume a specific concrete implementation. * Also, this interface is likely to grow new methods over time, so third-party From e2c2f6b8ed568d539e4f02e763753d4648ae4220 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 16 Jan 2025 16:20:35 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.4' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 2557e5bd..ddc7c744 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # Scala Steward: Reformat with scalafmt 3.8.2 f5a756f05939939b4a30a4109f1a3b2cf472d85a + +# Scala Steward: Reformat with scalafmt 3.8.4 +7674b8eb48dc8e33debb1acad4365364b8c12d5a