Skip to content

Commit

Permalink
Merge pull request #326 from nrkno/update/scala-library-2.13.14
Browse files Browse the repository at this point in the history
Update scala-library, scala-reflect to 2.13.14
  • Loading branch information
hamnis committed May 13, 2024
2 parents eb11e6f + 126495d commit f545a5a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ThisBuild / githubWorkflowBuild := {
}
}

val Scala213 = "2.13.13"
val Scala213 = "2.13.14"
ThisBuild / crossScalaVersions := Seq(Scala213, "3.3.3")
ThisBuild / scalaVersion := Scala213 // the default Scala
ThisBuild / tlVersionIntroduced := Map(
Expand Down
2 changes: 0 additions & 2 deletions core/src/main/scala-2/no/nrk/bigquery/BQReadCompat.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import magnolia1.{CaseClass, Magnolia}

import org.apache.avro
import org.apache.avro.generic.GenericRecord
import scala.annotation.nowarn

private[bigquery] trait BQReadCompat { self: BQRead.type =>
// magnolia automatic derivation begin
Expand Down Expand Up @@ -50,7 +49,6 @@ private[bigquery] trait BQReadCompat { self: BQRead.type =>
def derived[T]: BQRead[T] = macro Magnolia.gen[T]
// magnolia automatic derivation end

@nowarn("cat=unused")
implicit def convertsTuple[A: BQRead, B: BQRead]: BQRead[(A, B)] =
derived[(A, B)]

Expand Down
2 changes: 0 additions & 2 deletions core/src/main/scala/no/nrk/bigquery/PartitionLoader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import no.nrk.bigquery.syntax.*
import fs2.Stream

import java.time.{Instant, LocalDate, LocalDateTime, YearMonth}
import scala.annotation.nowarn

private[bigquery] object PartitionLoader {
def loadGenericPartitions[F[_]: Concurrent](
Expand Down Expand Up @@ -587,7 +586,6 @@ private[bigquery] object PartitionLoader {
|ORDER BY 1 DESC""".stripMargin
}

@nowarn
def withRowCountFromTableData[P: BQRead](
table: BQTableLike[Unit],
inRange: BQSqlFrag,
Expand Down
10 changes: 4 additions & 6 deletions testing/src/main/scala/no/nrk/bigquery/testing/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,25 @@ import cats.syntax.show.*
import io.circe.{Decoder, Encoder}
import no.nrk.bigquery

import scala.annotation.nowarn

package object testing {
def tempTable(partitionId: BQPartitionId[Any]): Ident =
Ident(partitionId.show.filter(c => c.isLetterOrDigit || c == '_'))

implicit val encoderIdent: Encoder[Ident] = Encoder.encodeString.contramap(_.value)

implicit lazy val encodeField: Encoder[BQField] = {
@nowarn implicit val encodesStandardSQLTypeName: Encoder[BQField.Type] =
implicit val encodesStandardSQLTypeName: Encoder[BQField.Type] =
Encoder[String].contramap(_.name)

@nowarn implicit val encodesFieldMode: Encoder[bigquery.BQField.Mode] =
implicit val encodesFieldMode: Encoder[bigquery.BQField.Mode] =
Encoder[String].contramap(_.name)
io.circe.generic.semiauto.deriveEncoder
}

implicit lazy val decodeField: Decoder[BQField] = {
@nowarn implicit val decodesStandardSQLTypeName: Decoder[BQField.Type] =
implicit val decodesStandardSQLTypeName: Decoder[BQField.Type] =
Decoder[String].map(BQField.Type.unsafeFromString)
@nowarn implicit val decodesFieldMode: Decoder[BQField.Mode] =
implicit val decodesFieldMode: Decoder[BQField.Mode] =
Decoder[String].map(BQField.Mode.unsafeFromString)
io.circe.generic.semiauto.deriveDecoder
}
Expand Down

0 comments on commit f545a5a

Please sign in to comment.