diff --git a/.circleci/config.yml b/.circleci/config.yml index 33c38943f8..6df8e3c857 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: - checkout - restore_cache: key: sbtcache - - run: sbt ++2.12.16 core/test http4s/test akkaHttp/test play/test zioHttp/test examples/compile catsInterop/compile benchmarks/compile tools/test codegenSbt/test clientJVM/test monixInterop/compile tapirInterop/test federation/test reporting/test + - run: sbt ++2.12.17 core/test http4s/test akkaHttp/test play/test zioHttp/test examples/compile catsInterop/compile benchmarks/compile tools/test codegenSbt/test clientJVM/test monixInterop/compile tapirInterop/test federation/test reporting/test - save_cache: key: sbtcache paths: @@ -36,7 +36,7 @@ jobs: - checkout - restore_cache: key: sbtcache - - run: sbt ++2.12.16 core/test http4s/test akkaHttp/test play/test zioHttp/test examples/compile catsInterop/compile benchmarks/compile tools/test codegenSbt/test clientJVM/test monixInterop/compile tapirInterop/test federation/test reporting/test + - run: sbt ++2.12.17 core/test http4s/test akkaHttp/test play/test zioHttp/test examples/compile catsInterop/compile benchmarks/compile tools/test codegenSbt/test clientJVM/test monixInterop/compile tapirInterop/test federation/test reporting/test - save_cache: key: sbtcache paths: @@ -50,7 +50,7 @@ jobs: - checkout - restore_cache: key: sbtcache - - run: sbt ++2.12.16 codegenSbt/scripted + - run: sbt ++2.12.17 codegenSbt/scripted - save_cache: key: sbtcache paths: diff --git a/build.sbt b/build.sbt index a8c24f0ad8..f77d5dad02 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import org.scalajs.linker.interface.ModuleSplitStyle import sbtcrossproject.CrossPlugin.autoImport.{ crossProject, CrossType } -val scala212 = "2.12.16" +val scala212 = "2.12.17" val scala213 = "2.13.8" val scala3 = "3.2.0" val allScala = Seq(scala212, scala213, scala3) diff --git a/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/build.sbt b/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/build.sbt index 03eea4ef3f..8db5b7ec9b 100644 --- a/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/build.sbt +++ b/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/build.sbt @@ -1,7 +1,7 @@ import sbt.Def.spaceDelimited import sbt.librarymanagement.Resolver -val scala212 = "2.12.16" +val scala212 = "2.12.17" val scala213 = "2.13.8" val scala3 = "3.2.0" val allScala = Seq(scala212, scala213, scala3) diff --git a/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/project/build.properties b/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/project/build.properties index d738b858c8..1cfbe550d5 100644 --- a/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/project/build.properties +++ b/codegen-sbt/src/sbt-test/compiletime-codegen/test-compile/project/build.properties @@ -1 +1 @@ -sbt.version = 1.7.1 +sbt.version = 1.7.2 diff --git a/core/src/main/scala-2/caliban/schema/SchemaDerivation.scala b/core/src/main/scala-2/caliban/schema/SchemaDerivation.scala index ea8cf1a0f7..0b9467ce78 100644 --- a/core/src/main/scala-2/caliban/schema/SchemaDerivation.scala +++ b/core/src/main/scala-2/caliban/schema/SchemaDerivation.scala @@ -4,7 +4,7 @@ import caliban.Value._ import caliban.introspection.adt._ import caliban.parsing.adt.Directive import caliban.schema.Annotations._ -import caliban.schema.Step._ +import caliban.schema.Step.{ PureStep => _, _ } import caliban.schema.Types._ import magnolia._ diff --git a/core/src/main/scala/caliban/schema/Schema.scala b/core/src/main/scala/caliban/schema/Schema.scala index 86e780d5f7..9ae3b1be12 100644 --- a/core/src/main/scala/caliban/schema/Schema.scala +++ b/core/src/main/scala/caliban/schema/Schema.scala @@ -6,7 +6,7 @@ import caliban.Value._ import caliban.execution.Field import caliban.introspection.adt._ import caliban.parsing.adt.{ Directive, Directives } -import caliban.schema.Step._ +import caliban.schema.Step.{ PureStep => _, _ } import caliban.schema.Types._ import caliban.uploads.Upload import caliban.{ InputValue, ResponseValue } diff --git a/project/build.properties b/project/build.properties index d738b858c8..1cfbe550d5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.7.1 +sbt.version = 1.7.2