Updates Spark to version 3.0.0

Author: asm0dey

core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>kotlin-spark-api-parent</artifactId>
     <groupId>org.jetbrains.kotlin.spark</groupId>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
   </parent>
   <artifactId>core</artifactId>
   <name>Kotlin Spark API: Scala core</name>
@@ -26,7 +26,6 @@
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-sql_2.12</artifactId>
-      <version>3.0.0-preview2</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

core/src/main/scala/org/apache/spark/sql/KotlinWrappers.scala

@@ -19,7 +19,9 @@
  */
 package org.apache.spark.sql
 
+import org.apache.spark.sql.catalyst.analysis.Resolver
 import org.apache.spark.sql.catalyst.expressions.{AttributeReference, Expression}
+import org.apache.spark.sql.catalyst.util.StringUtils
 import org.apache.spark.sql.types.{DataType, Metadata, StructField, StructType}
 
 
@@ -68,9 +70,9 @@ class KDataTypeWrapper(val dt: StructType
 
   override private[sql] def getFieldIndex(name: String) = dt.getFieldIndex(name)
 
-  override private[sql] def findNestedField(fieldNames: Seq[String], includeCollections: Boolean) = dt.findNestedField(fieldNames, includeCollections)
+  override private[sql] def findNestedField(fieldNames: Seq[String], includeCollections: Boolean, resolver: Resolver) = dt.findNestedField(fieldNames, includeCollections, resolver)
 
-  override private[sql] def buildFormattedString(prefix: String, builder: StringBuilder): Unit = dt.buildFormattedString(prefix, builder)
+  override private[sql] def buildFormattedString(prefix: String, stringConcat: StringUtils.StringConcat, maxDepth: Int): Unit = dt.buildFormattedString(prefix, stringConcat, maxDepth)
 
   override protected[sql] def toAttributes: Seq[AttributeReference] = dt.toAttributes
 

examples/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>kotlin-spark-api-parent</artifactId>
         <groupId>org.jetbrains.kotlin.spark</groupId>
-        <version>0.1.0</version>
+        <version>0.2.0</version>
     </parent>
 
     <groupId>org.jetbrains.kotlin.spark.examples</groupId>
@@ -32,7 +32,6 @@
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-sql_2.12</artifactId>
-            <version>3.0.0-preview2</version>
         </dependency>
 
     </dependencies>

kotlin-spark-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>kotlin-spark-api-parent</artifactId>
         <groupId>org.jetbrains.kotlin.spark</groupId>
-        <version>0.1.0</version>
+        <version>0.2.0</version>
     </parent>
 
     <artifactId>kotlin-spark-api</artifactId>
@@ -41,7 +41,6 @@
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-sql_2.12</artifactId>
-            <version>3.0.0-preview2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.jetbrains.kotlin.spark</groupId>
     <artifactId>kotlin-spark-api-parent</artifactId>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
     <name>kotlin-spark-api-parent</name>
     <url>http://maven.apache.org</url>
     <packaging>pom</packaging>
@@ -13,6 +13,15 @@
         <module>examples</module>
         <module>core</module>
     </modules>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.spark</groupId>
+                <artifactId>spark-sql_2.12</artifactId>
+                <version>3.0.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <build>
         <pluginManagement>
             <plugins>