Skip to content

Commit

Permalink
Update Scala 2.12 to 2.12.17
Browse files Browse the repository at this point in the history
Fixes issues with scala-xml bincompat issues
See scala/bug#12632
  • Loading branch information
guizmaii committed Oct 14, 2022
1 parent 1c1ce13 commit 2ba1dd2
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.7.1
sbt.version = 1.7.2
Original file line number Diff line number Diff line change
Expand Up @@ -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._

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/caliban/schema/Schema.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.7.1
sbt.version = 1.7.2

0 comments on commit 2ba1dd2

Please sign in to comment.