Merge pull request #14 from scala-steward/update/scalafmt-core-2.7.5

Update scalafmt-core to 2.7.5
ghostbuster91 · Apr 16, 2021 · 19411fa · 19411fa
2 parents 9866fff + 36605bb
commit 19411fa
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 13 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "2.7.4"
+version = "2.7.5"
 
 rewrite {
   rules = [

diff --git a/codegen-sbt-plugin/src/main/scala/io/github/ghostbuster91/sttp/client3/SbtLogAdapter.scala b/codegen-sbt-plugin/src/main/scala/io/github/ghostbuster91/sttp/client3/SbtLogAdapter.scala
@@ -1,5 +1,3 @@
 package io.github.ghostbuster91.sttp.client3
 
-class SbtLogAdapter(logger: sbt.Logger) extends LogAdapter {
-
-}
+class SbtLogAdapter(logger: sbt.Logger) extends LogAdapter {}
diff --git a/codegen-sbt-plugin/src/sbt-test/codegen/simple/build.sbt b/codegen-sbt-plugin/src/sbt-test/codegen/simple/build.sbt
@@ -8,6 +8,6 @@ lazy val root = (project in file("."))
       "com.softwaremill.sttp.client3" %% "circe" % "3.1.9",
       "io.circe" %% "circe-core" % "0.13.0",
       "io.circe" %% "circe-generic" % "0.13.0",
-      "io.circe" %% "circe-parser" % "0.13.0",
+      "io.circe" %% "circe-parser" % "0.13.0"
     )
   )
diff --git a/codegen-sbt-plugin/src/sbt-test/codegen/simple_2_13/build.sbt b/codegen-sbt-plugin/src/sbt-test/codegen/simple_2_13/build.sbt
@@ -8,6 +8,6 @@ lazy val root = (project in file("."))
       "com.softwaremill.sttp.client3" %% "circe" % "3.1.9",
       "io.circe" %% "circe-core" % "0.13.0",
       "io.circe" %% "circe-generic" % "0.13.0",
-      "io.circe" %% "circe-parser" % "0.13.0",
+      "io.circe" %% "circe-parser" % "0.13.0"
     )
   )
diff --git a/codegen-sbt-plugin/src/sbt-test/codegen/simple_scalafmt/build.sbt b/codegen-sbt-plugin/src/sbt-test/codegen/simple_scalafmt/build.sbt
@@ -8,6 +8,6 @@ lazy val root = (project in file("."))
       "com.softwaremill.sttp.client3" %% "circe" % "3.1.9",
       "io.circe" %% "circe-core" % "0.13.0",
       "io.circe" %% "circe-generic" % "0.13.0",
-      "io.circe" %% "circe-parser" % "0.13.0",
+      "io.circe" %% "circe-parser" % "0.13.0"
     )
   )
diff --git a/core/src/test/resources/api/simple/simple_get_product_array.scala b/core/src/test/resources/api/simple/simple_get_product_array.scala
@@ -11,14 +11,14 @@ trait CirceCodecs extends AutoDerivation with SttpCirceApi
 
 case class Category(
     id: Int,
-    name: String,
+    name: String
 )
 
 case class Pet(
     id: Int,
     name: String,
     categories: List[Category],
-    status: String,
+    status: String
 )
 
 class DefaultApi(baseUrl: String) extends CirceCodecs {

diff --git a/core/src/test/resources/api/uri/get_with_multiple_path_param.scala b/core/src/test/resources/api/uri/get_with_multiple_path_param.scala
@@ -14,7 +14,7 @@ case class Person(name: String, age: Int)
 class DefaultApi(baseUrl: String) extends CirceCodecs {
   def getPersonByIdAndName(
       personId: Int,
-      personName: Option[String],
+      personName: Option[String]
   ): Request[Person, Any] = basicRequest
     .get(uri"$baseUrl/person/$personId/$personName")
     .response(asJson[Person].getRight)

diff --git a/core/src/test/resources/api/uri/get_with_multiple_path_param_2.scala b/core/src/test/resources/api/uri/get_with_multiple_path_param_2.scala
@@ -14,7 +14,7 @@ case class Person(name: String, age: Int)
 class DefaultApi(baseUrl: String) extends CirceCodecs {
   def getPersonByIdAndName(
       personId: Int,
-      personName: Option[String],
+      personName: Option[String]
   ): Request[Person, Any] = basicRequest
     .get(uri"$baseUrl/person/asd/$personId/$personName")
     .response(asJson[Person].getRight)

diff --git a/core/src/test/resources/api/uri/mixed_path_and_query.scala b/core/src/test/resources/api/uri/mixed_path_and_query.scala
@@ -11,10 +11,10 @@ trait CirceCodecs extends AutoDerivation with SttpCirceApi
 class DefaultApi(baseUrl: String) extends CirceCodecs {
   def getSomething(
       petId: Int,
-      additionalMetadata: Option[String],
+      additionalMetadata: Option[String]
   ): Request[Unit, Any] = basicRequest
     .get(
-      uri"$baseUrl/pet/$petId/uploadImage?additionalMetadata=$additionalMetadata",
+      uri"$baseUrl/pet/$petId/uploadImage?additionalMetadata=$additionalMetadata"
     )
     .response(asJson[Unit].getRight)
 }