Skip to content

Commit

Permalink
Update scala-compiler, scala-library, ... to 2.13.15 (#5504)
Browse files Browse the repository at this point in the history
Co-authored-by: Michel Davit <[email protected]>
  • Loading branch information
scala-steward and RustedBones authored Oct 16, 2024
1 parent 6cbb4b3 commit a4f84c1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions project/ScalacOptions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 0 additions & 8 deletions scio-core/src/main/scala/com/spotify/scio/schemas/To.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)
Expand Down

0 comments on commit a4f84c1

Please sign in to comment.