Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency updates #560

Merged
merged 7 commits into from
Jan 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
val avroVersion = "1.11.3"
val catsVersion = "2.9.0"
val catsVersion = "2.10.0"
val disciplineScalaTestVersion = "2.2.0"
val enumeratumVersion = "1.7.2"
val jacksonVersion = "2.14.2"
val enumeratumVersion = "1.7.3"
val jacksonVersion = "2.16.1"
val magnolia2Version = "0.17.0"
val magnolia3Version = "1.3.0"
val magnolia3Version = "1.3.4"
val munitVersion = "0.7.29"
val refinedVersion = "0.10.3"
val scalaCollectionCompatVersion = "2.9.0"
val refinedVersion = "0.11.0"
val scalaCollectionCompatVersion = "2.11.0"
val shapeless3Version = "3.3.0"
val shapelessVersion = "2.3.10"
val slf4jNopVersion = "2.0.9"
val slf4jNopVersion = "2.0.10"

val scala212 = "2.12.18"
val scala213 = "2.13.10"
val scala3 = "3.2.2"
val scala213 = "2.13.12"
val scala3 = "3.3.1"

lazy val vulcan = project
.in(file("."))
Expand Down Expand Up @@ -336,7 +336,8 @@ lazy val scalaSettings = Seq(
"-Ywarn-dead-code",
"-Ywarn-numeric-widen",
"-Ywarn-value-discard",
"-Ywarn-unused"
"-Ywarn-unused",
"-Wconf:cat=unused-nowarn:s"
)
} else Seq()

Expand Down
3 changes: 2 additions & 1 deletion modules/core/src/main/scala-2/AvroDoc.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

package vulcan

import scala.annotation.StaticAnnotation
import scala.annotation.{StaticAnnotation, nowarn}

/**
* Annotation which can be used to include documentation
Expand All @@ -30,6 +30,7 @@ final class AvroDoc(final val doc: String) extends StaticAnnotation {
}

private[vulcan] object AvroDoc {
@nowarn("cat=deprecation")
final def unapply(avroDoc: AvroDoc): Some[String] =
Some(avroDoc.doc)
}
3 changes: 2 additions & 1 deletion modules/core/src/main/scala-2/AvroNamespace.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

package vulcan

import scala.annotation.StaticAnnotation
import scala.annotation.{StaticAnnotation, nowarn}

/**
* Annotation which can be used to set the namespace
Expand All @@ -27,6 +27,7 @@ final class AvroNamespace(final val namespace: String) extends StaticAnnotation
}

private[vulcan] object AvroNamespace {
@nowarn("cat=deprecation")
final def unapply(avroNamespace: AvroNamespace): Some[String] =
Some(avroNamespace.namespace)
}
11 changes: 6 additions & 5 deletions modules/core/src/main/scala/vulcan/Codec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1049,11 +1049,12 @@ object Codec extends CodecCompanionCompat {
new Schema.Field(
field.name,
schema,
field.doc.orNull,
default.map {
case null => Schema.Field.NULL_DEFAULT_VALUE
case other => adaptForSchema(other)
}.orNull,
field.doc.orNull, {
default.map { default =>
if (default == null) Schema.Field.NULL_DEFAULT_VALUE
else adaptForSchema(default)
}.orNull
},
field.order.getOrElse(Schema.Field.Order.ASCENDING)
)

Expand Down
Loading