diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index db8a466..26072b5 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.6.1 122bd2ff9365edaae9ecf907e8b25ae07e6a761e + +# Scala Steward: Reformat with scalafmt 3.10.1 +9bf2fcb5e86138b71e64c1c34c050a6d86c9eead diff --git a/.scalafmt.conf b/.scalafmt.conf index d7f45d6..26e860f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -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 = "->>" } diff --git a/build.sbt b/build.sbt index 11e9d65..9c80a05 100644 --- a/build.sbt +++ b/build.sbt @@ -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*") @@ -77,6 +77,6 @@ lazy val zioComposeGraphQL = project.in(file("./compose-graphql")) ZIOTest, ZIOTestSbt, PPrint, - Caliban + Caliban, ), ) diff --git a/compose-graphql/src/main/scala/compose/graphql/Graph.scala b/compose-graphql/src/main/scala/compose/graphql/Graph.scala index 8e6e645..dfc6842 100644 --- a/compose-graphql/src/main/scala/compose/graphql/Graph.scala +++ b/compose-graphql/src/main/scala/compose/graphql/Graph.scala @@ -1,6 +1,6 @@ package compose.graphql -import compose.{ExecutionPlan, ~>} +import compose.{~>, ExecutionPlan} import zio.schema.codec.JsonCodec.JsonEncoder import zio.schema.{DeriveSchema, Schema} diff --git a/compose-graphql/src/main/scala/compose/graphql/StepGenerator.scala b/compose-graphql/src/main/scala/compose/graphql/StepGenerator.scala index fe7f81b..b6e2242 100644 --- a/compose-graphql/src/main/scala/compose/graphql/StepGenerator.scala +++ b/compose-graphql/src/main/scala/compose/graphql/StepGenerator.scala @@ -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) } } diff --git a/compose-graphql/src/main/scala/compose/graphql/TypeGenerator.scala b/compose-graphql/src/main/scala/compose/graphql/TypeGenerator.scala index da72136..ef60f0f 100644 --- a/compose-graphql/src/main/scala/compose/graphql/TypeGenerator.scala +++ b/compose-graphql/src/main/scala/compose/graphql/TypeGenerator.scala @@ -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) } } diff --git a/compose-graphql/src/test/scala/compose/graphql/internal/JsonPlaceholder.scala b/compose-graphql/src/test/scala/compose/graphql/internal/JsonPlaceholder.scala index 8408a61..439f656 100644 --- a/compose-graphql/src/test/scala/compose/graphql/internal/JsonPlaceholder.scala +++ b/compose-graphql/src/test/scala/compose/graphql/internal/JsonPlaceholder.scala @@ -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 { diff --git a/compose/src/main/scala/compose/dsl/ArrowDSL.scala b/compose/src/main/scala/compose/dsl/ArrowDSL.scala index 35e61b9..f711b3f 100644 --- a/compose/src/main/scala/compose/dsl/ArrowDSL.scala +++ b/compose/src/main/scala/compose/dsl/ArrowDSL.scala @@ -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 diff --git a/compose/src/main/scala/compose/dsl/BooleanDSL.scala b/compose/src/main/scala/compose/dsl/BooleanDSL.scala index 2c20280..4ab8624 100644 --- a/compose/src/main/scala/compose/dsl/BooleanDSL.scala +++ b/compose/src/main/scala/compose/dsl/BooleanDSL.scala @@ -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] { diff --git a/compose/src/main/scala/compose/dsl/CodecDSL.scala b/compose/src/main/scala/compose/dsl/CodecDSL.scala index 0acd6fd..855c016 100644 --- a/compose/src/main/scala/compose/dsl/CodecDSL.scala +++ b/compose/src/main/scala/compose/dsl/CodecDSL.scala @@ -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 { diff --git a/compose/src/main/scala/compose/dsl/FoldDSL.scala b/compose/src/main/scala/compose/dsl/FoldDSL.scala index ceb0720..9767d80 100644 --- a/compose/src/main/scala/compose/dsl/FoldDSL.scala +++ b/compose/src/main/scala/compose/dsl/FoldDSL.scala @@ -1,6 +1,6 @@ package compose.dsl -import compose.{ExecutionPlan, Lambda, ~>} +import compose.{~>, ExecutionPlan, Lambda} import zio.schema.Schema object FoldDSL { diff --git a/compose/src/main/scala/compose/dsl/ListDSL.scala b/compose/src/main/scala/compose/dsl/ListDSL.scala index 9e5f3d2..95779b2 100644 --- a/compose/src/main/scala/compose/dsl/ListDSL.scala +++ b/compose/src/main/scala/compose/dsl/ListDSL.scala @@ -1,6 +1,6 @@ package compose.dsl -import compose.{ExecutionPlan, Lambda, ~>} +import compose.{~>, ExecutionPlan, Lambda} import zio.schema.Schema object ListDSL { diff --git a/compose/src/main/scala/compose/dsl/NumericDSL.scala b/compose/src/main/scala/compose/dsl/NumericDSL.scala index 40b4bea..bd0e7ea 100644 --- a/compose/src/main/scala/compose/dsl/NumericDSL.scala +++ b/compose/src/main/scala/compose/dsl/NumericDSL.scala @@ -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 { diff --git a/compose/src/main/scala/compose/dsl/RemoteDSL.scala b/compose/src/main/scala/compose/dsl/RemoteDSL.scala index 49742e1..0225156 100644 --- a/compose/src/main/scala/compose/dsl/RemoteDSL.scala +++ b/compose/src/main/scala/compose/dsl/RemoteDSL.scala @@ -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 { diff --git a/compose/src/main/scala/compose/dsl/ScopeDSL.scala b/compose/src/main/scala/compose/dsl/ScopeDSL.scala index 6ad9810..37ab7f8 100644 --- a/compose/src/main/scala/compose/dsl/ScopeDSL.scala +++ b/compose/src/main/scala/compose/dsl/ScopeDSL.scala @@ -2,7 +2,7 @@ package compose.dsl import compose.ExecutionPlan.Scoped import compose.model.Scope -import compose.{Lambda, ~>} +import compose.{~>, Lambda} object ScopeDSL { diff --git a/compose/src/main/scala/compose/dsl/StringDSL.scala b/compose/src/main/scala/compose/dsl/StringDSL.scala index 1a4107c..72949e8 100644 --- a/compose/src/main/scala/compose/dsl/StringDSL.scala +++ b/compose/src/main/scala/compose/dsl/StringDSL.scala @@ -1,7 +1,7 @@ package compose.dsl import compose.ExecutionPlan.Textual -import compose.{Lambda, ~>} +import compose.{~>, Lambda} object StringDSL { trait Op[-A, +B] { diff --git a/compose/src/main/scala/compose/dsl/TupleDSL.scala b/compose/src/main/scala/compose/dsl/TupleDSL.scala index 36c5469..6d56722 100644 --- a/compose/src/main/scala/compose/dsl/TupleDSL.scala +++ b/compose/src/main/scala/compose/dsl/TupleDSL.scala @@ -1,7 +1,7 @@ package compose.dsl import compose.ExecutionPlan.Tupled -import compose.{Lambda, ~>} +import compose.{~>, Lambda} object TupleDSL { trait Op[-A, +B] { diff --git a/compose/src/main/scala/compose/model/LambdaLens.scala b/compose/src/main/scala/compose/model/LambdaLens.scala index 23924aa..e4530ff 100644 --- a/compose/src/main/scala/compose/model/LambdaLens.scala +++ b/compose/src/main/scala/compose/model/LambdaLens.scala @@ -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 diff --git a/compose/src/main/scala/compose/model/Ref.scala b/compose/src/main/scala/compose/model/Ref.scala index 451ddf7..4c287f6 100644 --- a/compose/src/main/scala/compose/model/Ref.scala +++ b/compose/src/main/scala/compose/model/Ref.scala @@ -1,7 +1,7 @@ package compose.model import compose.ExecutionPlan.Scoped -import compose.{Lambda, ~>} +import compose.{~>, Lambda} import zio.schema.Schema /** diff --git a/compose/src/test/scala/compose/LambdaSpec.scala b/compose/src/test/scala/compose/LambdaSpec.scala index c5d7274..1d4ca91 100644 --- a/compose/src/test/scala/compose/LambdaSpec.scala +++ b/compose/src/test/scala/compose/LambdaSpec.scala @@ -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