From a4f84c1dda4e5a6fe703e8b30439a51a03fc1a18 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:31:39 +0200 Subject: [PATCH] Update scala-compiler, scala-library, ... to 2.13.15 (#5504) Co-authored-by: Michel Davit --- build.sbt | 2 +- project/ScalacOptions.scala | 6 +++--- project/plugins.sbt | 2 +- .../src/main/scala/com/spotify/scio/schemas/To.scala | 8 -------- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index 055ddac8c6..b164906b1e 100644 --- a/build.sbt +++ b/build.sbt @@ -206,7 +206,7 @@ ThisBuild / developers := List( ) // scala versions -val scala213 = "2.13.14" +val scala213 = "2.13.15" val scala212 = "2.12.20" val scalaDefault = scala213 diff --git a/project/ScalacOptions.scala b/project/ScalacOptions.scala index 0e7c8ce370..60159a18cc 100644 --- a/project/ScalacOptions.scala +++ b/project/ScalacOptions.scala @@ -57,12 +57,12 @@ object ScalacOptions { // silence all scala library deprecation warnings in 2.13 // since we still support 2.12 "conf:cat=deprecation&origin=scala\\..*&since>2.12.99:s" + + // until we can set fatalWarningOptions, handle those as errors + ",cat=unused:e" + // silence unused-imports compat ",cat=unused-imports&origin=scala\\.collection\\.compat\\..*:s" + ",cat=unused-imports&origin=kantan\\.codecs\\.compat\\..*:s" + - ",cat=unused-imports&origin=com\\.spotify\\.scio\\.repl\\.compat\\..*:s" + - // until we can set fatalWarningOptions, handle those as errors - ",cat=unused:e", + ",cat=unused-imports&origin=com\\.spotify\\.scio\\.repl\\.compat\\..*:s", _.isBetween(V2_13_2, V3_0_0) ) diff --git a/project/plugins.sbt b/project/plugins.sbt index e95e3a065c..846d1510b2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -17,7 +17,7 @@ addSbtPlugin("com.github.sbt" % "sbt-site" % "1.7.0") addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0") addSbtPlugin("com.github.sbt" % "sbt-paradox-material-theme" % "0.7.0") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7") val avroVersion = sys.props.get("avro.version").getOrElse("1.11.3") diff --git a/scio-core/src/main/scala/com/spotify/scio/schemas/To.scala b/scio-core/src/main/scala/com/spotify/scio/schemas/To.scala index 8c96232fb0..76ca75ca10 100644 --- a/scio-core/src/main/scala/com/spotify/scio/schemas/To.scala +++ b/scio-core/src/main/scala/com/spotify/scio/schemas/To.scala @@ -24,7 +24,6 @@ import org.apache.beam.sdk.schemas.{Schema => BSchema, SchemaCoder} import org.apache.beam.sdk.values._ import org.typelevel.scalaccompat.annotation.nowarn -import scala.annotation.tailrec import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag @@ -38,13 +37,6 @@ sealed trait To[I, O] extends (SCollection[I] => SCollection[O]) with Serializab object To { - @tailrec @inline - private def getBaseType(t: BSchema.FieldType): BSchema.FieldType = { - val log = t.getLogicalType() - if (log == null) t - else getBaseType(log.getBaseType()) - } - // Position API private case class Location(p: List[String]) private case class Positional[T](location: Location, value: T)