Skip to content

Commit

Permalink
Organize imports
Browse files Browse the repository at this point in the history
  • Loading branch information
armanbilge committed Nov 25, 2023
1 parent b19aee5 commit a9355ad
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 15 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ jobs:
if: matrix.java == 'corretto@8' && matrix.os == 'ubuntu-latest'
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck

- name: Check scalafix lints
if: matrix.java == 'corretto@8' && matrix.os == 'ubuntu-latest'
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check'

- name: scalaJSLink
if: matrix.project == 'rootJS'
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
Expand Down
2 changes: 2 additions & 0 deletions .scalafix.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
rules = [OrganizeImports]
OrganizeImports.removeUnused = false
8 changes: 4 additions & 4 deletions core/src/main/scala/feral/IOSetup.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

package feral

import scala.concurrent.Future

import cats.effect.unsafe.IORuntime
import cats.effect.kernel.Resource
import cats.effect.IO
import cats.effect.kernel.Resource
import cats.effect.std.Dispatcher
import cats.effect.unsafe.IORuntime
import cats.syntax.all._

import scala.concurrent.Future

private[feral] trait IOSetup {

protected def runtime: IORuntime = IORuntime.global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ package cloudformation
import cats._
import cats.syntax.all._
import feral.lambda.cloudformation.CloudFormationRequestType._
import io.circe.{Json, JsonObject}
import io.circe.testing.instances.{arbitraryJson, arbitraryJsonObject}
import org.http4s.{Charset => _, _}
import io.circe.Json
import io.circe.JsonObject
import io.circe.testing.instances.arbitraryJson
import io.circe.testing.instances.arbitraryJsonObject
import org.http4s.syntax.all._
import org.http4s.{Charset => _, _}
import org.scalacheck.Arbitrary
import org.scalacheck.Arbitrary.arbitrary
import org.scalacheck.{Arbitrary, Gen}
import org.scalacheck.Gen

import java.nio.charset.Charset
import java.util.UUID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import fs2.Stream
import org.http4s.Charset
import org.http4s.Header
import org.http4s.Headers
import org.http4s.{HttpApp, HttpRoutes}
import org.http4s.HttpApp
import org.http4s.HttpRoutes
import org.http4s.Method
import org.http4s.Request
import org.http4s.Uri
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import cats.syntax.all._
import feral.lambda.events.ApiGatewayProxyEventV2
import feral.lambda.events.ApiGatewayProxyEventV2Suite
import munit.CatsEffectSuite
import org.http4s.Headers
import org.http4s.Method
import org.http4s.syntax.all._
import org.http4s.Headers

class ApiGatewayProxyHandlerSuite extends CatsEffectSuite {

Expand Down
5 changes: 2 additions & 3 deletions lambda/jvm/src/main/scala/feral/lambda/IOLambdaPlatform.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@

package feral.lambda

import scala.concurrent.Await
import scala.concurrent.duration.Duration

import cats.data.OptionT
import cats.effect.IO
import cats.effect.kernel.Resource
Expand All @@ -30,6 +27,8 @@ import io.circe.syntax._
import java.io.InputStream
import java.io.OutputStream
import java.io.OutputStreamWriter
import scala.concurrent.Await
import scala.concurrent.duration.Duration

private[lambda] abstract class IOLambdaPlatform[Event, Result]
extends lambdaRuntime.RequestStreamHandler { this: IOLambda[Event, Result] =>
Expand Down
2 changes: 1 addition & 1 deletion lambda/shared/src/main/scala/feral/lambda/Context.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package feral.lambda

import cats.~>
import cats.Applicative
import cats.~>
import io.circe.JsonObject

import scala.concurrent.duration.FiniteDuration
Expand Down
4 changes: 3 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.2")
val sbtlTlV = "0.6.2"
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtlTlV)
addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % sbtlTlV)
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")

0 comments on commit a9355ad

Please sign in to comment.