finagle · Jan 13, 2019 · Jan 15, 2019 · Jan 15, 2019 · Jan 17, 2019 · Jan 17, 2019
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,8 @@
+# Scala Steward: Reformat with scalafmt 3.5.8
+699c16e7a245b2ffee1ba4de9bfd1093a3d5072f
+
+# Scala Steward: Reformat with scalafmt 3.8.4
+cc2327d46a560d51bfc6d0e417dacd42fe8a8578
+
+# Scala Steward: Reformat with scalafmt 3.8.6
+19f7c988f7aa16ab4154220681c654526116afa9
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,33 @@
+name: Scala CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        java: ['adopt@1.11']
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up sbt and java
+        uses: olafurpg/setup-scala@v13
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Run tests
+        shell: bash
+        env:
+          ENCRYPTION_PASSWORD: ${{secrets.ENCRYPTION_PASSWORD}}
+          JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
+        run: ./build/build.sh
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,9 @@ target/
 .project
 .classpath
 local.*
+
+.bloop
+.metals
+.vscode
+project/metals.sbt
+project/project
diff --git a/.scala-steward.conf b/.scala-steward.conf
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -0,0 +1,7 @@
+OrganizeImports {
+  groupedImports = Keep
+  removeUnused = true
+}
+rules = [
+  OrganizeImports
+]
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -0,0 +1,12 @@
+version = 3.9.3
+maxColumn = 160
+align.preset = some
+runner.dialect = scala213
+rewrite.rules = [
+  RedundantBraces,
+  RedundantParens,
+  SortModifiers,
+  PreferCurlyFors
+]
+assumeStandardLibraryStripMargin = true
+optIn.breakChainOnFirstMethodDot = false
diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -17,12 +17,12 @@ _contributing process_ looks as follows:
 Finch follows the [Effective Scala][1] code style guide. When in doubt, look around the codebase and see how it's done
 elsewhere.
 
-* Code and comments should be formatted to a width no greater than 120 columns
+* Code and comments should be formatted to a width no greater than 160 columns
 * Files should be exempt of trailing spaces
 * Each abstraction with corresponding implementations should live in its own Scala file, i.e `Endpoint.scala`
 * Each implicit conversion (if possible) should be defined in the corresponding companion object
 
-That said, the Scala style checker `sbt scalastyle` should pass on the code.
+That said, the Scala source code shall be formatted with `sbt fmt`
 
 ## Write Tests
 Finch uses both [ScalaTest][2] and [ScalaCheck][3] with the following settings:

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ close as possible to the bare metal Finagle API.
 
 Badges
 ------
-[![Build Status](https://img.shields.io/travis/finagle/finch/master.svg)](https://travis-ci.org/finagle/finch)
+[![Scala CI](https://github.com/finagle/finch/actions/workflows/build.yml/badge.svg)](https://github.com/finagle/finch/actions/workflows/build.yml)
 [![Coverage Status](https://img.shields.io/codecov/c/github/finagle/finch/master.svg)](https://codecov.io/github/finagle/finch)
 [![Gitter](https://img.shields.io/badge/gitter-join%20chat-green.svg)](https://gitter.im/finagle/finch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.finagle/finch-core_2.11.svg)](https://index.scala-lang.org/finagle/finch/finch-core)
@@ -22,10 +22,9 @@ Finch uses multi-project structure and contains of the following _modules_:
 * [`finch-argonaut`](argonaut) - [Argonaut][argonaut] + Finch
 * [`finch-circe`](circe) - [Circe][circe] + Finch
 * [`finch-iteratee`](iteratee) - [Iteratee][iteratee] + Finch
-* [`finch-fs2`](fs2) - [FS2][fs] + Finch
+* [`finch-fs2`](fs2) - [FS2][fs2] + Finch
 * [`finch-refined`](refined) - [Refined][refined] + Finch
 * [`finch-test`](test) - the test support classes/functions
-* [`finch-sse`](sse) - SSE ([Server Sent Events][server-sent-events]) support in Finch
 
 Additional Modules
 ------------------
@@ -37,7 +36,7 @@ reach out if you need published artifacts):
 * [`finch-json4s`][finch-json4s] - [JSON4s][json4s] + Finch
 * [`finch-playjson`][finch-playjson] - [PlayJson][playjson] + Finch
 * [`finch-sprayjson`][finch-sprayjson] - [SprayJson][sprayjson] + Finch
-* [`finch-oauth2`](finch-oath2) - [Finagle OAuth2](finagle-oauth2) + Finch
+* [`finch-oauth2`][finch-oauth2] - [Finagle OAuth2][finagle-oauth2] + Finch
 
 Installation
 ------------
@@ -49,26 +48,19 @@ libraryDependencies ++= Seq(
 )
 ```
 
-Cats Effect and Twitter Futures
--------------------------------
-
-Starting with 0.25, Finch artifacts are published for both Twitter Futures (`Endpoint[A]`) and
-Cats Effects (`Endpoint[F[_], A]`):
-
- - Use `finch-*` artifacts for endpoints locked in Twitter Futures (legacy)
- - Use `finchx-*` artifacts for polymorphic endpoints (recommended)
-
 Hello World!
 ------------
-This "Hello World!" example is built with just `finchx-core` (polymorphic endpoints):
+This "Hello World!" example is built with just `finch-core`:
 
 ```scala
-import io.finch._, cats.effect.IO
-import com.twitter.finagle.Http
-
-object Main extends App with Endpoint.Module[IO] {
-  val api: Endpoint[IO, String] = get("hello") { Ok("Hello, World!") }
-  Http.server.serve(":8080", api.toServiceAs[Text.Plain])
+import cats.effect.{IO, IOApp}
+import io.finch._
+
+object Main extends IOApp.Simple with Endpoint.Module[IO] {
+  override def run: IO[Unit] = {
+    val api: Endpoint[IO, String] = get("hello") { Ok("Hello, World!") }
+    Bootstrap[IO].serve[Text.Plain](api).listen(":8080").useForever
+  }
 }
 ```
 
@@ -111,6 +103,7 @@ Documentation
 
 Adopters
 --------
+* [PITS Global Data Recovery Services](https://www.pitsdatarecovery.net/)
 * [Despegar](http://www.despegar.com)
 * [Earnest](http://meetearnest.com)
 * [Globo.com](http://globo.com)
@@ -125,7 +118,7 @@ Adopters
 * [QuizUp](http://www.quizup.com)
 * [Lookout](http://www.lookout.com)
 * [Project September](http://projectseptember.com/)
-* [Sigma](http://thesigma.com)
+* [Merit](https://merits.com)
 * [D.A.Consortium](http://www.dac.co.jp/english/)
 * [Redbubble](https://redbubble.com/)
 * [Zalando](https://zalando.de)
@@ -144,6 +137,7 @@ Related Projects
 * [Finch Rich](https://github.com/akozhemiakin/finchrich): Macro-based controllers for Finch
 * [Finch Quickstart](https://github.com/zdavep/finch-quickstart): A skeleton Finch project
 * [Finch OAuth2](https://github.com/finch/finch-oauth2): the OAuth2 support backed by the [finagle-oauth2][finagle-oauth2] library
+* [Finch Todo Backend](https://github.com/ilya-murzinov/finch-todo-backend): Finch implementation of [todobackend](http://www.todobackend.com/)
 
 Contributing
 ------------
@@ -175,7 +169,7 @@ limitations under the License.
 [gitter]: https://gitter.im/finagle/finch
 [finagle]: https://github.com/twitter/finagle
 [circe]: https://github.com/circe/circe
-[jackson]: http://wiki.fasterxml.com/JacksonHome
+[jackson]: https://github.com/FasterXML/jackson
 [argonaut]: http://argonaut.io
 [finagle-oauth2]: https://github.com/finagle/finagle-oauth2
 [json4s]: http://json4s.org
@@ -197,9 +191,8 @@ limitations under the License.
 [finch-json4s]: https://github.com/finch/finch-json4s
 [finch-sprayjson]: https://github.com/finch/finch-sprayjson
 [finch-playjson]: https://github.com/finch/finch-playjson
-[finch-oauth2]: https://github.com/finch/finch-ouath2
+[finch-oauth2]: https://github.com/finch/finch-oauth2
 [fs2]: https://github.com/functional-streams-for-scala/fs2
-[server-sent-events]: https://en.wikipedia.org/wiki/Server-sent_events
 [vkostyukov]: https://twitter.com/vkostyukov
 [travisbrown]: https://twitter.com/travisbrown
 [ryan_plessner]: https://twitter.com/ryan_plessner

diff --git a/argonaut/src/main/scala/io/finch/argonaut/Decoders.scala b/argonaut/src/main/scala/io/finch/argonaut/Decoders.scala
@@ -1,21 +1,18 @@
 package io.finch.argonaut
 
 import argonaut._
-import argonaut.DecodeJson
 import cats.syntax.either._
-import io.finch._
+import io.finch.Decode
 import io.finch.internal.HttpContent
 
 trait Decoders {
 
-  /**
-   * Maps Argonaut's [[DecodeJson]] to Finch's [[Decode]].
-   */
+  /** Maps Argonaut's [[argonaut.DecodeJson]] to Finch's [[Decode]]. */
   implicit def decodeArgonaut[A](implicit d: DecodeJson[A]): Decode.Json[A] =
     Decode.json { (b, cs) =>
       Parse.parse(b.asString(cs)).flatMap(_.as[A].result.leftMap(_._1)) match {
         case Right(result) => Right(result)
-        case Left(error) => Left(new Exception(error))
+        case Left(error)   => Left(new Exception(error))
       }
-  }
+    }
 }
diff --git a/argonaut/src/main/scala/io/finch/argonaut/Encoders.scala b/argonaut/src/main/scala/io/finch/argonaut/Encoders.scala
@@ -8,9 +8,7 @@ trait Encoders {
 
   protected def printer: PrettyParams
 
-  /**
-   * Maps Argonaut's [[EncodeJson]] to Finch's [[Encode]].
-   */
+  /** Maps Argonaut's [[argonaut.EncodeJson]] to Finch's [[Encode]]. */
   implicit def encodeArgonaut[A](implicit e: EncodeJson[A]): Encode.Json[A] =
     Encode.json((a, cs) => Buf.ByteArray.Owned(printer.pretty(e.encode(a)).getBytes(cs.name)))
 }
diff --git a/argonaut/src/main/scala/io/finch/argonaut/package.scala b/argonaut/src/main/scala/io/finch/argonaut/package.scala
@@ -10,16 +10,12 @@ package object argonaut extends Encoders with Decoders {
     override protected val printer: PrettyParams = PrettyParams.nospace.copy(dropNullKeys = true)
   }
 
-  /**
-   * Provides an implicit [[PrettyParams]] that preserves order of the JSON fields.
-   */
+  /** Provides an implicit [[_root_.argonaut.PrettyParams]] that preserves order of the JSON fields. */
   object preserveOrder extends Encoders with Decoders {
     override protected val printer: PrettyParams = PrettyParams.nospace.copy(preserveOrder = true)
   }
 
-  /**
-   * Provides an implicit [[PrettyParams]] that both preserves order of the JSON fields and drop null keys.
-   */
+  /** Provides an implicit [[_root_.argonaut.PrettyParams]] that both preserves order of the JSON fields and drop null keys. */
   object preserveOrderAndDropNullKeys extends Encoders with Decoders {
     override protected val printer: PrettyParams = PrettyParams.nospace.copy(preserveOrder = true, dropNullKeys = true)
   }

diff --git a/argonaut/src/test/scala/io/finch/argonaut/ArgonautSpec.scala b/argonaut/src/test/scala/io/finch/argonaut/ArgonautSpec.scala
@@ -1,7 +1,7 @@
 package io.finch.argonaut
 
-import argonaut._
 import argonaut.Argonaut._
+import argonaut._
 import io.finch.test.AbstractJsonSpec
 import io.finch.test.data._