Skip to content

Commit

Permalink
Update scala 2.13 (#429)
Browse files Browse the repository at this point in the history
  • Loading branch information
alfonsorr authored Feb 28, 2024
1 parent 00af418 commit 81a576d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ val versionRegex = """^(.*)\.(.*)\.(.*)$""".r
val versionRegexShort = """^(.*)\.(.*)$""".r

val scala212 = "2.12.18"
val scala213 = "2.13.8"
val scala213 = "2.13.12"

val parserSparkVersion: String => String = {
case versionRegexShort("3", "0") => spark30Version
Expand Down
17 changes: 9 additions & 8 deletions core/src/main/scala/doric/syntax/DStructs.scala
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package doric
package syntax

import scala.jdk.CollectionConverters._
import scala.language.dynamics

import cats.data.Kleisli
import cats.evidence.Is
import cats.implicits._
import doric.sem.{ColumnTypeError, Location, SparkErrorWrapper}
import doric.types.SparkType
import org.apache.spark.sql.catalyst.expressions.ExtractValue
import org.apache.spark.sql.{Column, Dataset, Row, functions => f}
import shapeless.labelled.FieldType
import shapeless.{::, HList, LabelledGeneric, Witness}
import shapeless.labelled.FieldType

import scala.jdk.CollectionConverters._
import scala.language.dynamics
import org.apache.spark.sql.{Column, Dataset, Row, functions => f}
import org.apache.spark.sql.catalyst.expressions.ExtractValue

protected trait DStructs {

Expand Down Expand Up @@ -131,7 +131,8 @@ protected trait DStructs {
type V = _V
}

implicit def Found[K <: Symbol, _V: SparkType, T <: HList] =
implicit def Found[K <: Symbol, _V: SparkType, T <: HList]
: SelectorWithSparkType[FieldType[K, _V] :: T, K] { type V = _V } =
new SelectorWithSparkType[FieldType[K, _V] :: T, K] {
type V = _V
val st = SparkType[_V]
Expand All @@ -141,7 +142,7 @@ protected trait DStructs {
trait SelectorLPI {
implicit def KeepFinding[K1, V1, T <: HList, K <: Symbol](implicit
T: SelectorWithSparkType[T, K]
) =
): SelectorWithSparkType[FieldType[K1, V1] :: T, K] { type V = T.V } =
new SelectorWithSparkType[FieldType[K1, V1] :: T, K] {
type V = T.V
val st = T.st
Expand Down

0 comments on commit 81a576d

Please sign in to comment.