From 1cf7521a2754ee3b47a3f3c7d9b82c900f7bec29 Mon Sep 17 00:00:00 2001 From: Kai <450507+neko-kai@users.noreply.github.com> Date: Tue, 27 Feb 2024 12:08:16 +0000 Subject: [PATCH] Update to Scala 2.13.13, 2.12.19 --- .scala-steward.conf | 1 + project/ScalaVersions.scala | 4 ++-- sbtgen/src/main/scala/izumi/sbtgen/Defaults.scala | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .scala-steward.conf diff --git a/.scala-steward.conf b/.scala-steward.conf new file mode 100644 index 0000000..c0720fa --- /dev/null +++ b/.scala-steward.conf @@ -0,0 +1 @@ +updates.includeScala = true diff --git a/project/ScalaVersions.scala b/project/ScalaVersions.scala index 1784ee7..17c0846 100644 --- a/project/ScalaVersions.scala +++ b/project/ScalaVersions.scala @@ -1,6 +1,6 @@ object ScalaVersions { - val scala_212 = "2.12.18" - val scala_213 = "2.13.12" + val scala_212 = "2.12.19" + val scala_213 = "2.13.13" val scala_3 = "3.2.2" val scalaJsVersion = "1.15.0" diff --git a/sbtgen/src/main/scala/izumi/sbtgen/Defaults.scala b/sbtgen/src/main/scala/izumi/sbtgen/Defaults.scala index 462a430..4b22930 100644 --- a/sbtgen/src/main/scala/izumi/sbtgen/Defaults.scala +++ b/sbtgen/src/main/scala/izumi/sbtgen/Defaults.scala @@ -165,7 +165,7 @@ object Defaults { ) final val Scala213Options = Scala2Options ++ Seq[Const]( - "-Xsource:3", // Compile with maximum dotty compatibility + "-Xsource:3-cross", // Compile with maximum dotty compatibility "-P:kind-projector:underscore-placeholders", // Use underscore type-lambda syntax by default CRaw("""if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning""""), // enable fatal warnings on CI