From 86d930b251e24cd38e496ae283128e4e2fcd814f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 15 Oct 2022 09:38:42 +0000 Subject: [PATCH] Update scala-compiler, scala-library to 2.12.17 --- .circleci/config.yml | 20 ++++++++++---------- build.sbt | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1840aa12..b2212217 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ commands: parameters: scala_version: type: string - default: 2.12.16 + default: 2.12.17 sbt_tasks: type: string default: update compile test:compile test doc package osgiBundle @@ -44,7 +44,7 @@ jobs: parameters: scala_version: description: "Scala version" - default: 2.12.16 + default: 2.12.17 type: string java_version: description: "Java version" @@ -61,7 +61,7 @@ jobs: parameters: scala_version: description: "Scala version" - default: 2.12.16 + default: 2.12.17 type: string steps: - checkout @@ -75,7 +75,7 @@ jobs: parameters: scala_version: description: "Scala version" - default: 2.12.16 + default: 2.12.17 type: string steps: - checkout @@ -92,9 +92,9 @@ workflows: build: jobs: - scala_job: - name: 2.12.16 + name: 2.12.17 java_version: jdk8 - scala_version: 2.12.16 + scala_version: 2.12.17 - scala_job: name: 2.13.8 java_version: jdk8 @@ -106,7 +106,7 @@ workflows: - scala_job: name: jdk11_2.12 java_version: jdk11 - scala_version: 2.12.16 + scala_version: 2.12.17 - scala_job: name: jdk11_2.13 java_version: jdk11 @@ -118,7 +118,7 @@ workflows: - scala_job: name: jdk17_2.12 java_version: jdk17 - scala_version: 2.12.16 + scala_version: 2.12.17 - scala_job: name: jdk17_2.13 java_version: jdk17 @@ -129,7 +129,7 @@ workflows: scala_version: 3.1.3 - scalajs_job: name: sjs1.0_2.12 - scala_version: 2.12.16 + scala_version: 2.12.17 - scalajs_job: name: sjs1.0_2.13 scala_version: 2.13.8 @@ -138,7 +138,7 @@ workflows: scala_version: 3.1.3 - scalanative_job: name: native0.4_2.12 - scala_version: 2.12.16 + scala_version: 2.12.17 - scalanative_job: name: native0.4_2.13 scala_version: 2.13.8 diff --git a/build.sbt b/build.sbt index b2790666..c34aec2b 100644 --- a/build.sbt +++ b/build.sbt @@ -35,8 +35,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform) .settings( name := "scala-xml", scalaModuleAutomaticModuleName := Some("scala.xml"), - crossScalaVersions := Seq("2.13.8", "2.12.16", "3.1.3"), - scalaVersion := "2.12.16", + crossScalaVersions := Seq("2.13.8", "2.12.17", "3.1.3"), + scalaVersion := "2.12.17", scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) =>