From dc31bbfc97fced7436c497c3f4f06ee260dcccb8 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Mon, 1 Nov 2021 05:10:15 +0000 Subject: [PATCH 1/2] Update scalafmt-core to 3.0.8 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index cf6919a4..c7517eea 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.0.7 +version = 3.0.8 style = defaultWithAlign maxColumn = 100 From beb551704bc4173cc025ea9298411a185a76a2d0 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Mon, 1 Nov 2021 05:10:25 +0000 Subject: [PATCH 2/2] Reformat with scalafmt 3.0.8 --- .../src/main/scala/github4s/http/Http4sSyntax.scala | 6 +++--- .../src/test/scala/github4s/internal/Base64Spec.scala | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/github4s/src/main/scala/github4s/http/Http4sSyntax.scala b/github4s/src/main/scala/github4s/http/Http4sSyntax.scala index 76567918..fac40db6 100644 --- a/github4s/src/main/scala/github4s/http/Http4sSyntax.scala +++ b/github4s/src/main/scala/github4s/http/Http4sSyntax.scala @@ -56,9 +56,9 @@ object Http4sSyntax { } .mkString("&") - //Adding query parameters normally has different encoding than normal Uris. - //To work around this, we create one verbatim from a manually encoded String. - //See: https://github.com/http4s/http4s/issues/4203 + // Adding query parameters normally has different encoding than normal Uris. + // To work around this, we create one verbatim from a manually encoded String. + // See: https://github.com/http4s/http4s/issues/4203 val verbatimQuery = Query.unsafeFromString(Uri.encode(queryString)) Uri diff --git a/github4s/src/test/scala/github4s/internal/Base64Spec.scala b/github4s/src/test/scala/github4s/internal/Base64Spec.scala index 503ef625..867c26df 100644 --- a/github4s/src/test/scala/github4s/internal/Base64Spec.scala +++ b/github4s/src/test/scala/github4s/internal/Base64Spec.scala @@ -49,11 +49,11 @@ class Base64Spec extends AnyFunSpec { ) for (t <- testVectors) - //test encoding + // test encoding assert(t._1.getBytes.toBase64 == t._2) for (t <- testVectors) - //test decoding + // test decoding assert(t._2.toByteArray sameElements t._1.getBytes) } @@ -69,7 +69,7 @@ class Base64Spec extends AnyFunSpec { ) for (t <- testVectors) - //test decoding + // test decoding assert( t._2.reverse.dropWhile(_ == '=').reverse.toByteArray(base64Url) sameElements t._1.getBytes ) @@ -87,7 +87,7 @@ class Base64Spec extends AnyFunSpec { ) for (t <- testVectors) - //test encoding + // test encoding assert(t._1.getBytes.toBase64(base64Url) == t._2) } @@ -103,7 +103,7 @@ class Base64Spec extends AnyFunSpec { ) for (t <- testVectors) - //test encoding + // test encoding assert(t._2.toByteArray(base64Url) sameElements t._1.getBytes) } }