Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.6.1
122bd2ff9365edaae9ecf907e8b25ae07e6a761e

# Scala Steward: Reformat with scalafmt 3.10.1
9bf2fcb5e86138b71e64c1c34c050a6d86c9eead
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ rewrite.rules = [RedundantParens]
runner.dialect = scala213
spaces.inImportCurlyBraces = false
trailingCommas = "always"
version = "3.6.1"
version = "3.10.1"

align.tokens."+" = [
{code = "->>" }
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import Dependencies._

// Flags
Global / semanticdbEnabled := true
Global / onChangedBuildSource := ReloadOnSourceChanges
Global / scalacOptions := Seq(
Global / semanticdbEnabled := true
Global / onChangedBuildSource := ReloadOnSourceChanges
Global / scalacOptions := Seq(
"-Ywarn-unused",
"-Werror",
"-feature",
"-language:reflectiveCalls",
"-deprecation",
)
Global / scalaVersion := "2.13.8"
ThisBuild / versionScheme := Some("early-semver")
Global / scalaVersion := "2.13.8"
ThisBuild / versionScheme := Some("early-semver")
ThisBuild / testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework")
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"))
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
Expand Down Expand Up @@ -77,6 +77,6 @@ lazy val zioComposeGraphQL = project.in(file("./compose-graphql"))
ZIOTest,
ZIOTestSbt,
PPrint,
Caliban
Caliban,
),
)
2 changes: 1 addition & 1 deletion compose-graphql/src/main/scala/compose/graphql/Graph.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package compose.graphql

import compose.{ExecutionPlan, ~>}
import compose.{~>, ExecutionPlan}

import zio.schema.codec.JsonCodec.JsonEncoder
import zio.schema.{DeriveSchema, Schema}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ final class StepGenerator(graph: Graph, i: Interpreter) {
// case MetaSchema.FailNode(message, path, optional) => ???
// case MetaSchema.Either(path, left, right, optional) => ???
// case MetaSchema.Sum(id, path, cases, optional) => ???
case schema => throw new MatchError(schema)
case schema => throw new MatchError(schema)
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ final class TypeGenerator(graph: Graph) {
}.foreach { case (id, cons) =>
pending.get(id) match {
case None => pending += (id -> cons)
case Some(value) => pending += id -> (value ++ cons)
case Some(value) => pending += id -> (value ++ cons)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package compose.graphql.internal
import compose.graphql.Graph
import compose.macros.DeriveAccessors
import compose.model.http.Request
import compose.{Lambda, ~>}
import compose.{~>, Lambda}
import zio.schema.{DeriveSchema, Schema}

object JsonPlaceholder {
Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/dsl/ArrowDSL.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package compose.dsl
import compose.ExecutionPlan._
import compose.Lambda.constant
import compose.model.Transformation
import compose.{Interpreter, Lambda, model, ~>}
import compose.{~>, model, Interpreter, Lambda}
import zio.Task
import zio.schema.Schema

Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/dsl/BooleanDSL.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package compose.dsl

import compose.ExecutionPlan.Logical
import compose.Lambda.constant
import compose.{Lambda, ~>}
import compose.{~>, Lambda}

object BooleanDSL {
trait Op[-A, +B] {
Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/dsl/CodecDSL.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package compose.dsl
import compose.ExecutionPlan.Codec
import compose.model.Decoder
import compose.model.Decoder.HasDecoder
import compose.{Lambda, ~>}
import compose.{~>, Lambda}
import zio.schema.{DynamicValue, Schema}

object CodecDSL {
Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/dsl/FoldDSL.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package compose.dsl

import compose.{ExecutionPlan, Lambda, ~>}
import compose.{~>, ExecutionPlan, Lambda}
import zio.schema.Schema

object FoldDSL {
Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/dsl/ListDSL.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package compose.dsl

import compose.{ExecutionPlan, Lambda, ~>}
import compose.{~>, ExecutionPlan, Lambda}
import zio.schema.Schema

object ListDSL {
Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/dsl/NumericDSL.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package compose.dsl

import compose.ExecutionPlan.Numeric
import compose.Lambda.constant
import compose.{Lambda, ~>}
import compose.{~>, Lambda}
import zio.schema.Schema

object NumericDSL {
Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/dsl/RemoteDSL.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package compose.dsl

import compose.ExecutionPlan.Remote
import compose.model.http.{Request, Response}
import compose.{Lambda, ~>}
import compose.{~>, Lambda}

object RemoteDSL {
trait Ctr {
Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/dsl/ScopeDSL.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package compose.dsl

import compose.ExecutionPlan.Scoped
import compose.model.Scope
import compose.{Lambda, ~>}
import compose.{~>, Lambda}

object ScopeDSL {

Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/dsl/StringDSL.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package compose.dsl

import compose.ExecutionPlan.Textual
import compose.{Lambda, ~>}
import compose.{~>, Lambda}

object StringDSL {
trait Op[-A, +B] {
Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/dsl/TupleDSL.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package compose.dsl

import compose.ExecutionPlan.Tupled
import compose.{Lambda, ~>}
import compose.{~>, Lambda}

object TupleDSL {
trait Op[-A, +B] {
Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/model/LambdaLens.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package compose.model

import compose.ExecutionPlan.Optical
import compose.{Lambda, ~>}
import compose.{~>, Lambda}
import zio.prelude.NonEmptyList
import zio.schema.Schema

Expand Down
2 changes: 1 addition & 1 deletion compose/src/main/scala/compose/model/Ref.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package compose.model

import compose.ExecutionPlan.Scoped
import compose.{Lambda, ~>}
import compose.{~>, Lambda}
import zio.schema.Schema

/**
Expand Down
2 changes: 1 addition & 1 deletion compose/src/test/scala/compose/LambdaSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import zio.durationInt
import zio.schema.{DeriveSchema, Schema}
import zio.test.Assertion.{equalTo, isRight, isTrue}
import zio.test.TestAspect.timeout
import zio.test.{Gen, TestConsole, ZIOSpecDefault, assert, assertZIO, check, checkAll}
import zio.test.{assert, assertZIO, check, checkAll, Gen, TestConsole, ZIOSpecDefault}

import scala.language.postfixOps

Expand Down
Loading