From e2d2a36d31f1e4a3f157202b972b644b68042012 Mon Sep 17 00:00:00 2001 From: jules Ivanic Date: Fri, 14 Oct 2022 07:29:12 +0200 Subject: [PATCH] Update Scala 2.12 to `2.12.17` Fixes issues with scala-xml bincompat issues See https://github.com/scala/bug/issues/12632 --- .circleci/config.yml | 6 +++--- build.sbt | 2 +- .../src/sbt-test/compiletime-codegen/test-compile/build.sbt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) 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)