including spark 3.2.3, 3.3.1, 3.2.2, scala bumps, small fix in Encoding

Author: Jolanrensen

.github/workflows/build.yml

@@ -10,24 +10,24 @@ jobs:
  build-all-versions:
  strategy:
  matrix:
- scala: [ "2.12.16", "2.13.8" ]
- spark: [ "3.3.0", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
+ scala: [ "2.12.17", "2.13.10" ]
+ spark: [ "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
  exclude:
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.3"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.2"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.1"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.0"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.3"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.2"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.1"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.0"
  runs-on: ubuntu-latest
 

.github/workflows/publish_dev_version.yml

@@ -9,24 +9,24 @@ jobs:
  build-and-deploy:
  strategy:
  matrix:
- scala: [ "2.12.16", "2.13.8" ]
- spark: [ "3.3.0", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
+ scala: [ "2.12.17", "2.13.10" ]
+ spark: [ "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
  exclude:
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.3"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.2"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.1"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.0"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.3"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.2"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.1"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.0"
  runs-on: ubuntu-latest
  permissions:

.github/workflows/publish_release_version.yml

@@ -11,24 +11,24 @@ jobs:
  build-and-deploy-mvn-central:
  strategy:
  matrix:
- scala: [ "2.12.16", "2.13.8" ]
- spark: [ "3.3.0", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
+ scala: [ "2.12.17", "2.13.10" ]
+ spark: [ "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
  exclude:
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.3"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.2"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.1"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.1.0"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.3"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.2"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.1"
- - scala: "2.13.8"
+ - scala: "2.13.10"
  spark: "3.0.0"
  runs-on: ubuntu-latest
  permissions:

gradle.properties

@@ -7,9 +7,9 @@ GROUP=org.jetbrains.kotlinx.spark
 
 # Controls the spark and scala version for the entire project
 # can also be defined like ./gradlew -Pspark=X.X.X -Pscala=X.X.X build
-spark=3.3.0
-scala=2.13.8
-#scala=2.12.16
+spark=3.3.1
+scala=2.13.10
+# scala=2.12.17
 skipScalaTuplesInKotlin=false
 
 org.gradle.caching=true

kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/Encoding.kt

@@ -236,7 +236,7 @@ fun schema(type: KType, map: Map<String, KType> = mapOf()): DataType {
  )
  }
 
- klass.isSubclassOf(Map::class) -> {
+ klass == Map::class -> {
  val mapKeyParam = types.getValue(klass.typeParameters[0].name)
  val mapValueParam = types.getValue(klass.typeParameters[1].name)