Merge branch 'main' into update/sbt-1.10.0

nrkno · May 13, 2024 · 7914f9a · 7914f9a
2 parents aa5aa32 + f545a5a
commit 7914f9a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/build.sbt b/build.sbt
@@ -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(
@@ -140,7 +140,7 @@ lazy val `google-client` = crossProject(JVMPlatform)
       "org.scalameta" %% "munit-scalacheck" % "0.7.29" % Test,
       "org.typelevel" %% "munit-cats-effect-3" % "1.0.7" % Test,
       addGoogleDep("com.google.cloud" % "google-cloud-bigquery" % "2.38.1"),
-      addGoogleDep("com.google.cloud" % "google-cloud-bigquerystorage" % "3.5.0"),
+      addGoogleDep("com.google.cloud" % "google-cloud-bigquerystorage" % "3.5.1"),
       "com.google.guava" % "guava" % "33.2.0-jre"
     ),
     Compile / doc / scalacOptions ++= Seq(
@@ -204,7 +204,7 @@ lazy val zetasql = crossProject(JVMPlatform)
   .settings(
     name := "bigquery-zetasql",
     libraryDependencies ++= Seq(
-      ("com.google.zetasql.toolkit" % "zetasql-toolkit-core" % "0.5.0")
+      ("com.google.zetasql.toolkit" % "zetasql-toolkit-core" % "0.5.1")
         .exclude("com.google.cloud", "google-cloud-spanner"),
       "org.scalameta" %% "munit" % "0.7.29",
       "org.typelevel" %% "munit-cats-effect-3" % "1.0.7"
@@ -221,7 +221,7 @@ lazy val `transfer-client` = crossProject(JVMPlatform)
   .settings(
     name := "bigquery-transfer-client",
     libraryDependencies ++= Seq(
-      "com.google.cloud" % "google-cloud-bigquerydatatransfer" % "2.42.0",
+      "com.google.cloud" % "google-cloud-bigquerydatatransfer" % "2.43.0",
       "org.scalameta" %% "munit" % "0.7.29",
       "org.typelevel" %% "munit-cats-effect-3" % "1.0.7"
     ),

diff --git a/core/src/main/scala-2/no/nrk/bigquery/BQReadCompat.scala b/core/src/main/scala-2/no/nrk/bigquery/BQReadCompat.scala
@@ -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
@@ -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)]
 

diff --git a/core/src/main/scala/no/nrk/bigquery/PartitionLoader.scala b/core/src/main/scala/no/nrk/bigquery/PartitionLoader.scala
@@ -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](
@@ -587,7 +586,6 @@ private[bigquery] object PartitionLoader {
                |ORDER BY 1 DESC""".stripMargin
       }
 
-    @nowarn
     def withRowCountFromTableData[P: BQRead](
         table: BQTableLike[Unit],
         inRange: BQSqlFrag,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.0")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.0")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.1")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.1")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
diff --git a/testing/src/main/scala/no/nrk/bigquery/testing/package.scala b/testing/src/main/scala/no/nrk/bigquery/testing/package.scala
@@ -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
   }