From c8c5382cc1564e5218a699bf0e1610f1f32803e4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 2 Aug 2025 15:57:46 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.9.9 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 908871f..5622d43 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.9.8" +version = "3.9.9" preset = default align.preset = some From 030e9c3fc56c060179f2b36ed551b94702d75261 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 2 Aug 2025 15:57:55 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.9.9 Executed command: scalafmt --non-interactive --- plugin/src/main/scala/com/github/eikek/sbt/openapi/Part.scala | 4 ++-- .../openapi-test/json-extra-scala/project/plugins.sbt | 2 +- .../src/sbt-test/openapi-test/json-scala/project/plugins.sbt | 2 +- .../sbt-test/openapi-test/simple-scala/project/plugins.sbt | 2 +- .../src/sbt-test/openapi-test/trait-scala/project/plugins.sbt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugin/src/main/scala/com/github/eikek/sbt/openapi/Part.scala b/plugin/src/main/scala/com/github/eikek/sbt/openapi/Part.scala index 8f9f9d7..7e10f03 100644 --- a/plugin/src/main/scala/com/github/eikek/sbt/openapi/Part.scala +++ b/plugin/src/main/scala/com/github/eikek/sbt/openapi/Part.scala @@ -4,7 +4,7 @@ case class Part(cnt: String) { def ++(p: Part): Part = render match { case "" => p - case s => + case s => p.render match { case "" => this case s2 => Part(s + "\n" + s2) @@ -37,7 +37,7 @@ case class Part(cnt: String) { def semicolon: Part = render match { case "" => this - case s => + case s => Part( s.split('\n').toList.map(l => if (l.endsWith(";")) l else l + ";").mkString("\n") ) diff --git a/plugin/src/sbt-test/openapi-test/json-extra-scala/project/plugins.sbt b/plugin/src/sbt-test/openapi-test/json-extra-scala/project/plugins.sbt index fdfc201..9b30b85 100644 --- a/plugin/src/sbt-test/openapi-test/json-extra-scala/project/plugins.sbt +++ b/plugin/src/sbt-test/openapi-test/json-extra-scala/project/plugins.sbt @@ -1,6 +1,6 @@ sys.props.get("plugin.version") match { case Some(x) => addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % x) - case _ => + case _ => sys.error( """|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin diff --git a/plugin/src/sbt-test/openapi-test/json-scala/project/plugins.sbt b/plugin/src/sbt-test/openapi-test/json-scala/project/plugins.sbt index fdfc201..9b30b85 100644 --- a/plugin/src/sbt-test/openapi-test/json-scala/project/plugins.sbt +++ b/plugin/src/sbt-test/openapi-test/json-scala/project/plugins.sbt @@ -1,6 +1,6 @@ sys.props.get("plugin.version") match { case Some(x) => addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % x) - case _ => + case _ => sys.error( """|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin diff --git a/plugin/src/sbt-test/openapi-test/simple-scala/project/plugins.sbt b/plugin/src/sbt-test/openapi-test/simple-scala/project/plugins.sbt index fdfc201..9b30b85 100644 --- a/plugin/src/sbt-test/openapi-test/simple-scala/project/plugins.sbt +++ b/plugin/src/sbt-test/openapi-test/simple-scala/project/plugins.sbt @@ -1,6 +1,6 @@ sys.props.get("plugin.version") match { case Some(x) => addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % x) - case _ => + case _ => sys.error( """|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin diff --git a/plugin/src/sbt-test/openapi-test/trait-scala/project/plugins.sbt b/plugin/src/sbt-test/openapi-test/trait-scala/project/plugins.sbt index fdfc201..9b30b85 100644 --- a/plugin/src/sbt-test/openapi-test/trait-scala/project/plugins.sbt +++ b/plugin/src/sbt-test/openapi-test/trait-scala/project/plugins.sbt @@ -1,6 +1,6 @@ sys.props.get("plugin.version") match { case Some(x) => addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % x) - case _ => + case _ => sys.error( """|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin From c8d00a8cb1a55392417dcbdff5b93526aaa12657 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 2 Aug 2025 15:57:55 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.9.9' 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 d1362fa..ba7bbd6 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,3 +6,6 @@ df4933f509193b30fb5d0654e2d16776efb9140b # Scala Steward: Reformat with scalafmt 3.8.4 0d74d14dcb684879af3cc1738418a05d2d9893b9 + +# Scala Steward: Reformat with scalafmt 3.9.9 +030e9c3fc56c060179f2b36ed551b94702d75261