Refactor build (#562)

* Fix build * Refactor build
hseeberger · Mar 26, 2021 · 1046ae7 · 1046ae7
1 parent 156395a
commit 1046ae7
Show file tree

Hide file tree

Showing 31 changed files with 124 additions and 156 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,15 +6,17 @@ on:
 
 jobs:
   publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
-      - uses: olafurpg/setup-scala@v2
-      - uses: olafurpg/setup-gpg@v2
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-gpg@v3
       - name: Publish ${{ github.ref }}
         run: sbt ci-release
         env:
-          PGP_SECRET: ${{ secrets.PGP_SECRET }}
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,10 +5,11 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+  workflow_dispatch:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 11

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -8,3 +8,4 @@ unindentTopLevelOperators  = true
 spaces.inImportCurlyBraces = true
 rewrite.rules              = ["AsciiSortImports", "RedundantBraces", "RedundantParens"]
 docstrings.blankFirstLine  = true
+trailingCommas             = preserve
diff --git a/akka-http-argonaut/src/main/scala/de/heikoseeberger/akkahttpargonaut/ArgonautSupport.scala b/akka-http-argonaut/src/main/scala/de/heikoseeberger/akkahttpargonaut/ArgonautSupport.scala
@@ -26,10 +26,8 @@ import akka.http.scaladsl.util.FastFuture
 import akka.stream.scaladsl.{ Flow, Source }
 import akka.util.ByteString
 import argonaut.{ DecodeJson, EncodeJson, Json, Parse, PrettyParams }
-
 import scala.collection.immutable.Seq
 import scala.concurrent.Future
-import scala.util.Try
 import scala.util.control.NonFatal
 
 /**

diff --git a/...http-argonaut/src/test/scala/de/heikoseeberger/akkahttpargonaut/ArgonautSupportSpec.scala b/...http-argonaut/src/test/scala/de/heikoseeberger/akkahttpargonaut/ArgonautSupportSpec.scala
@@ -25,11 +25,10 @@ import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeExcep
 import akka.stream.scaladsl.{ Sink, Source }
 import argonaut.Argonaut._
 import org.scalatest.BeforeAndAfterAll
-
-import scala.concurrent.Await
-import scala.concurrent.duration.DurationInt
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AsyncWordSpec
+import scala.concurrent.Await
+import scala.concurrent.duration.DurationInt
 
 object ArgonautSupportSpec {
 

diff --git a/akka-http-avro4s/src/main/scala/de/heikoseeberger/akkahttpavro4s/AvroSupport.scala b/akka-http-avro4s/src/main/scala/de/heikoseeberger/akkahttpavro4s/AvroSupport.scala
@@ -16,19 +16,24 @@
 
 package de.heikoseeberger.akkahttpavro4s
 
-import java.io.ByteArrayOutputStream
-
 import akka.http.javadsl.common.JsonEntityStreamingSupport
 import akka.http.scaladsl.common.EntityStreamingSupport
 import akka.http.scaladsl.marshalling.{ Marshaller, Marshalling, ToEntityMarshaller }
-import akka.http.scaladsl.model.MediaTypes.`application/json`
 import akka.http.scaladsl.model._
+import akka.http.scaladsl.model.MediaTypes.`application/json`
 import akka.http.scaladsl.unmarshalling.{ FromEntityUnmarshaller, Unmarshal, Unmarshaller }
 import akka.http.scaladsl.util.FastFuture
 import akka.stream.scaladsl.{ Flow, Source }
 import akka.util.ByteString
-import com.sksamuel.avro4s._
-
+import com.sksamuel.avro4s.{
+  AvroInputStream,
+  AvroOutputStream,
+  AvroSchema,
+  Decoder,
+  Encoder,
+  SchemaFor
+}
+import java.io.ByteArrayOutputStream
 import scala.collection.immutable.Seq
 import scala.concurrent.Future
 import scala.util.Try
@@ -70,7 +75,7 @@ trait AvroSupport {
 
   private def jsonSource[A: SchemaFor: Encoder](entitySource: SourceOf[A])(implicit
       support: JsonEntityStreamingSupport
-  ): SourceOf[ByteString] = {
+  ): SourceOf[ByteString] =
     entitySource
       .map { obj =>
         val baos   = new ByteArrayOutputStream()
@@ -81,7 +86,6 @@ trait AvroSupport {
       }
       .map(ByteString(_))
       .via(support.framingRenderer)
-  }
 
   def unmarshallerContentTypes: Seq[ContentTypeRange] = defaultContentTypes
 

diff --git a/akka-http-avro4s/src/test/scala/de/heikoseeberger/akkahttpavro4s/AvroSupportSpec.scala b/akka-http-avro4s/src/test/scala/de/heikoseeberger/akkahttpavro4s/AvroSupportSpec.scala
@@ -18,18 +18,17 @@ package de.heikoseeberger.akkahttpavro4s
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.marshalling.Marshal
-import akka.http.scaladsl.model.ContentTypes.{ `application/json`, `text/plain(UTF-8)` }
 import akka.http.scaladsl.model._
-import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException
+import akka.http.scaladsl.model.ContentTypes.{ `application/json`, `text/plain(UTF-8)` }
 import akka.http.scaladsl.unmarshalling.{ Unmarshal, Unmarshaller }
+import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException
 import akka.stream.scaladsl.{ Sink, Source }
 import com.sksamuel.avro4s.{ Decoder, Encoder, SchemaFor }
 import org.scalatest.BeforeAndAfterAll
-
-import scala.concurrent.Await
-import scala.concurrent.duration.DurationInt
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AsyncWordSpec
+import scala.concurrent.Await
+import scala.concurrent.duration.DurationInt
 
 object AvroSupportSpec {
 

diff --git a/akka-http-avro4s/src/test/scala/de/heikoseeberger/akkahttpavro4s/ExampleApp.scala b/akka-http-avro4s/src/test/scala/de/heikoseeberger/akkahttpavro4s/ExampleApp.scala
@@ -24,7 +24,6 @@ import akka.http.scaladsl.server.Directives
 import akka.http.scaladsl.unmarshalling.Unmarshal
 import akka.stream.scaladsl.Source
 import com.sksamuel.avro4s.{ FromRecord, SchemaFor, ToRecord }
-
 import scala.concurrent.Await
 import scala.concurrent.duration._
 import scala.io.StdIn

diff --git a/akka-http-circe/src/main/scala/de/heikoseeberger/akkahttpcirce/CirceSupport.scala b/akka-http-circe/src/main/scala/de/heikoseeberger/akkahttpcirce/CirceSupport.scala
@@ -32,14 +32,12 @@ import akka.http.scaladsl.util.FastFuture
 import akka.stream.scaladsl.{ Flow, Source }
 import akka.util.ByteString
 import cats.data.{ NonEmptyList, ValidatedNel }
-import cats.syntax.show.toShow
 import cats.syntax.either.catsSyntaxEither
+import cats.syntax.show.toShow
 import io.circe.{ Decoder, DecodingFailure, Encoder, Json, Printer, jawn }
 import io.circe.parser.parse
-
 import scala.collection.immutable.Seq
 import scala.concurrent.Future
-import scala.util.Try
 import scala.util.control.NonFatal
 
 /**

diff --git a/akka-http-circe/src/test/scala/de/heikoseeberger/akkahttpcirce/CirceSupportSpec.scala b/akka-http-circe/src/test/scala/de/heikoseeberger/akkahttpcirce/CirceSupportSpec.scala
@@ -35,11 +35,10 @@ import io.circe.{ DecodingFailure, Encoder, ParsingFailure, Printer }
 import io.circe.CursorOp.DownField
 import org.scalatest.{ BeforeAndAfterAll, EitherValues }
 import org.scalatest.concurrent.ScalaFutures
-
-import scala.concurrent.Await
-import scala.concurrent.duration.DurationInt
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AsyncWordSpec
+import scala.concurrent.Await
+import scala.concurrent.duration.DurationInt
 
 object CirceSupportSpec {
 

diff --git a/akka-http-circe/src/test/scala/de/heikoseeberger/akkahttpcirce/ExampleApp.scala b/akka-http-circe/src/test/scala/de/heikoseeberger/akkahttpcirce/ExampleApp.scala
@@ -23,9 +23,8 @@ import akka.http.scaladsl.model.{ HttpRequest, RequestEntity }
 import akka.http.scaladsl.server.Directives
 import akka.http.scaladsl.unmarshalling.Unmarshal
 import akka.stream.scaladsl.Source
-
-import scala.io.StdIn
 import scala.concurrent.duration._
+import scala.io.StdIn
 
 object ExampleApp {
 

diff --git a/akka-http-jackson/src/main/scala/de/heikoseeberger/akkahttpjackson/JacksonSupport.scala b/akka-http-jackson/src/main/scala/de/heikoseeberger/akkahttpjackson/JacksonSupport.scala
@@ -16,8 +16,6 @@
 
 package de.heikoseeberger.akkahttpjackson
 
-import java.lang.reflect.{ ParameterizedType, Type => JType }
-
 import akka.http.javadsl.common.JsonEntityStreamingSupport
 import akka.http.javadsl.marshallers.jackson.Jackson
 import akka.http.scaladsl.common.EntityStreamingSupport
@@ -31,7 +29,7 @@ import akka.util.ByteString
 import com.fasterxml.jackson.core.`type`.TypeReference
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
-
+import java.lang.reflect.{ ParameterizedType, Type => JType }
 import scala.collection.immutable.Seq
 import scala.concurrent.Future
 import scala.reflect.runtime.universe._
@@ -77,11 +75,9 @@ trait JacksonSupport {
         mirror.runtimeClass(t)
       else
         new ParameterizedType {
-          def getRawType = mirror.runtimeClass(t)
-
-          def getActualTypeArguments = t.typeArgs.map(mapType).toArray
-
-          def getOwnerType = null
+          def getRawType()             = mirror.runtimeClass(t)
+          def getActualTypeArguments() = t.typeArgs.map(mapType).toArray
+          def getOwnerType()           = null
         }
 
     new TypeReference[T] {

diff --git a/akka-http-jackson/src/test/scala/de/heikoseeberger/akkahttpjackson/ExampleApp.scala b/akka-http-jackson/src/test/scala/de/heikoseeberger/akkahttpjackson/ExampleApp.scala
@@ -22,7 +22,6 @@ import akka.http.scaladsl.model.HttpRequest
 import akka.http.scaladsl.server.Directives
 import akka.http.scaladsl.unmarshalling.Unmarshal
 import akka.stream.scaladsl.Source
-
 import scala.concurrent.Await
 import scala.concurrent.duration._
 import scala.io.StdIn

diff --git a/akka-http-jackson/src/test/scala/de/heikoseeberger/akkahttpjackson/JacksonSupportSpec.scala b/akka-http-jackson/src/test/scala/de/heikoseeberger/akkahttpjackson/JacksonSupportSpec.scala
@@ -18,17 +18,16 @@ package de.heikoseeberger.akkahttpjackson
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.marshalling.Marshal
-import akka.http.scaladsl.model.ContentTypes.{ `application/json`, `text/plain(UTF-8)` }
 import akka.http.scaladsl.model._
-import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException
+import akka.http.scaladsl.model.ContentTypes.{ `application/json`, `text/plain(UTF-8)` }
 import akka.http.scaladsl.unmarshalling.{ Unmarshal, Unmarshaller }
+import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException
 import akka.stream.scaladsl.{ Sink, Source }
 import org.scalatest.BeforeAndAfterAll
-
-import scala.concurrent.Await
-import scala.concurrent.duration.DurationInt
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AsyncWordSpec
+import scala.concurrent.Await
+import scala.concurrent.duration.DurationInt
 
 object JacksonSupportSpec {
 

diff --git a/akka-http-json4s/src/main/scala/de/heikoseeberger/akkahttpjson4s/Json4sSupport.scala b/akka-http-json4s/src/main/scala/de/heikoseeberger/akkahttpjson4s/Json4sSupport.scala
@@ -16,8 +16,6 @@
 
 package de.heikoseeberger.akkahttpjson4s
 
-import java.lang.reflect.InvocationTargetException
-
 import akka.http.javadsl.common.JsonEntityStreamingSupport
 import akka.http.scaladsl.common.EntityStreamingSupport
 import akka.http.scaladsl.marshalling.{ Marshaller, Marshalling, ToEntityMarshaller }
@@ -29,8 +27,8 @@ import akka.stream.Materializer
 import akka.stream.scaladsl.{ Flow, Source }
 import akka.util.ByteString
 import de.heikoseeberger.akkahttpjson4s.Json4sSupport.ShouldWritePretty.False
+import java.lang.reflect.InvocationTargetException
 import org.json4s.{ Formats, MappingException, Serialization }
-
 import scala.collection.immutable.Seq
 import scala.concurrent.{ ExecutionContext, Future }
 import scala.util.Try

diff --git a/akka-http-json4s/src/test/scala/de/heikoseeberger/akkahttpjson4s/ExampleApp.scala b/akka-http-json4s/src/test/scala/de/heikoseeberger/akkahttpjson4s/ExampleApp.scala
@@ -23,7 +23,6 @@ import akka.http.scaladsl.server.Directives
 import akka.http.scaladsl.unmarshalling.Unmarshal
 import akka.stream.scaladsl.Source
 import org.json4s.{ DefaultFormats, jackson }
-
 import scala.concurrent.Await
 import scala.concurrent.duration._
 import scala.io.StdIn

diff --git a/akka-http-json4s/src/test/scala/de/heikoseeberger/akkahttpjson4s/Json4sSupportSpec.scala b/akka-http-json4s/src/test/scala/de/heikoseeberger/akkahttpjson4s/Json4sSupportSpec.scala
@@ -18,18 +18,17 @@ package de.heikoseeberger.akkahttpjson4s
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.marshalling.Marshal
-import akka.http.scaladsl.model.ContentTypes.{ `application/json`, `text/plain(UTF-8)` }
 import akka.http.scaladsl.model._
-import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException
+import akka.http.scaladsl.model.ContentTypes.{ `application/json`, `text/plain(UTF-8)` }
 import akka.http.scaladsl.unmarshalling.{ Unmarshal, Unmarshaller }
+import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException
 import akka.stream.scaladsl.{ Sink, Source }
 import org.json4s.{ DefaultFormats, jackson, native }
 import org.scalatest.BeforeAndAfterAll
-
-import scala.concurrent.Await
-import scala.concurrent.duration.DurationInt
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AsyncWordSpec
+import scala.concurrent.Await
+import scala.concurrent.duration.DurationInt
 
 object Json4sSupportSpec {
 

diff --git a/...r-scala/src/main/scala/de/heikoseeberger/akkahttpjsoniterscala/JsoniterScalaSupport.scala b/...r-scala/src/main/scala/de/heikoseeberger/akkahttpjsoniterscala/JsoniterScalaSupport.scala
@@ -32,7 +32,6 @@ import akka.http.scaladsl.util.FastFuture
 import akka.stream.scaladsl.{ Flow, Source }
 import akka.util.ByteString
 import com.github.plokhotnyuk.jsoniter_scala.core._
-
 import scala.collection.immutable.Seq
 import scala.concurrent.Future
 import scala.util.Try

diff --git a/...tp-jsoniter-scala/src/test/scala/de/heikoseeberger/akkahttpjsoniterscala/ExampleApp.scala b/...tp-jsoniter-scala/src/test/scala/de/heikoseeberger/akkahttpjsoniterscala/ExampleApp.scala
@@ -22,7 +22,6 @@ import akka.http.scaladsl.model.HttpRequest
 import akka.http.scaladsl.server.{ Directives, Route }
 import akka.http.scaladsl.unmarshalling.Unmarshal
 import akka.stream.scaladsl.Source
-
 import scala.concurrent.Await
 import scala.concurrent.duration._
 import scala.io.StdIn

diff --git a/...ala/src/test/scala/de/heikoseeberger/akkahttpjsoniterscala/JsoniterScalaSupportSpec.scala b/...ala/src/test/scala/de/heikoseeberger/akkahttpjsoniterscala/JsoniterScalaSupportSpec.scala
@@ -18,19 +18,18 @@ package de.heikoseeberger.akkahttpjsoniterscala
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.marshalling.Marshal
-import akka.http.scaladsl.model.ContentTypes.{ `application/json`, `text/plain(UTF-8)` }
 import akka.http.scaladsl.model._
-import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException
+import akka.http.scaladsl.model.ContentTypes.{ `application/json`, `text/plain(UTF-8)` }
 import akka.http.scaladsl.unmarshalling.{ Unmarshal, Unmarshaller }
+import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException
 import akka.stream.scaladsl.{ Sink, Source }
 import com.github.plokhotnyuk.jsoniter_scala.core.JsonValueCodec
 import com.github.plokhotnyuk.jsoniter_scala.macros._
 import org.scalatest.BeforeAndAfterAll
-
-import scala.concurrent.Await
-import scala.concurrent.duration.DurationInt
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AsyncWordSpec
+import scala.concurrent.Await
+import scala.concurrent.duration.DurationInt
 
 object JsoniterScalaSupportSpec {
 

diff --git a/akka-http-ninny/src/main/scala/de/heikoseeberger/akkahttpninny/NinnySupport.scala b/akka-http-ninny/src/main/scala/de/heikoseeberger/akkahttpninny/NinnySupport.scala
@@ -16,19 +16,17 @@
 
 package de.heikoseeberger.akkahttpninny
 
-import java.nio.charset.StandardCharsets
-
 import akka.http.javadsl.common.JsonEntityStreamingSupport
 import akka.http.scaladsl.common.EntityStreamingSupport
 import akka.http.scaladsl.marshalling.{ Marshaller, Marshalling, ToEntityMarshaller }
-import akka.http.scaladsl.model.MediaTypes.`application/json`
 import akka.http.scaladsl.model.{ ContentTypeRange, HttpEntity, MediaType, MessageEntity }
+import akka.http.scaladsl.model.MediaTypes.`application/json`
 import akka.http.scaladsl.unmarshalling.{ FromEntityUnmarshaller, Unmarshal, Unmarshaller }
 import akka.http.scaladsl.util.FastFuture
 import akka.stream.scaladsl.{ Flow, Source }
 import akka.util.ByteString
 import io.github.kag0.ninny._
-
+import java.nio.charset.StandardCharsets
 import scala.collection.immutable.Seq
 import scala.concurrent.Future
 import scala.util.control.NonFatal

diff --git a/akka-http-ninny/src/test/scala/de/heikoseeberger/akkahttpninny/NinnySupportSpec.scala b/akka-http-ninny/src/test/scala/de/heikoseeberger/akkahttpninny/NinnySupportSpec.scala
@@ -18,19 +18,17 @@ package de.heikoseeberger.akkahttpninny
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.marshalling.Marshal
-import akka.http.scaladsl.model.ContentTypes.{ `application/json`, `text/plain(UTF-8)` }
 import akka.http.scaladsl.model._
-import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException
+import akka.http.scaladsl.model.ContentTypes.{ `application/json`, `text/plain(UTF-8)` }
 import akka.http.scaladsl.unmarshalling.{ Unmarshal, Unmarshaller }
+import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeException
 import akka.stream.scaladsl.{ Sink, Source }
 import io.github.kag0.ninny.JsonException
 import org.scalatest.BeforeAndAfterAll
-
-import scala.collection.immutable.Seq
-import scala.concurrent.Await
-import scala.concurrent.duration.DurationInt
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AsyncWordSpec
+import scala.concurrent.Await
+import scala.concurrent.duration.DurationInt
 
 object NinnySupportSpec {
 

diff --git a/akka-http-play-json/src/main/scala/de/heikoseeberger/akkahttpplayjson/PlayJsonSupport.scala b/akka-http-play-json/src/main/scala/de/heikoseeberger/akkahttpplayjson/PlayJsonSupport.scala
@@ -26,7 +26,6 @@ import akka.http.scaladsl.util.FastFuture
 import akka.stream.scaladsl.{ Flow, Source }
 import akka.util.ByteString
 import play.api.libs.json.{ JsError, JsResultException, JsValue, Json, Reads, Writes }
-
 import scala.collection.immutable.Seq
 import scala.concurrent.Future
 import scala.util.Try