From 54f7ab69ef487d3f9d98515494deb8b21b80136b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Wed, 16 Oct 2024 00:56:26 +0200 Subject: [PATCH] Bump scala to 3.3.4, scala-cli to 1.5.1 and scalatest to 3.2.19 --- .github/workflows/ci.yaml | 2 +- project.scala | 4 ++-- src/main/types/Encoder.scala | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3dbe19a..fac944e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,6 +15,6 @@ jobs: - name: Setup coursier cache uses: coursier/cache-action@v6.3 - name: Setup scala-cli - uses: VirtusLab/scala-cli-setup@v1.4.0 + uses: VirtusLab/scala-cli-setup@v1.5.1 - name: Run tests run: scala-cli test . --jvm temurin:11 diff --git a/project.scala b/project.scala index 1c4b8d2..0cf1427 100644 --- a/project.scala +++ b/project.scala @@ -1,4 +1,4 @@ -//> using scala "3.3.3" +//> using scala "3.3.4" //> using dep "org.apache.spark:spark-core_2.13:3.2.0" //> using dep "org.apache.spark:spark-sql_2.13:3.2.0" -//> using test.dep "org.scalatest::scalatest::3.2.16" +//> using test.dep "org.scalatest::scalatest::3.2.19" diff --git a/src/main/types/Encoder.scala b/src/main/types/Encoder.scala index b8cff2c..48f188d 100644 --- a/src/main/types/Encoder.scala +++ b/src/main/types/Encoder.scala @@ -172,7 +172,7 @@ object StructEncoder: } end fromMirrorImpl - inline given optFromMirror[A](using encoder: StructEncoder[A]): (Encoder[Option[A]] { type ColumnType = StructOptType[encoder.StructSchema] }) = + given optFromMirror[A](using encoder: StructEncoder[A]): (Encoder[Option[A]] { type ColumnType = StructOptType[encoder.StructSchema] }) = new Encoder[Option[A]]: override type ColumnType = StructOptType[encoder.StructSchema] override def encode(value: Option[A]): Any = value.map(encoder.encode).orNull