Skip to content

Commit f54ff0c

Browse files
gschulzeasm0dey
gschulze
authored and
asm0dey
committed
refactor: Finalize project structure
1 parent a66e528 commit f54ff0c

File tree

7 files changed

+147
-6
lines changed

7 files changed

+147
-6
lines changed

‎examples/pom-2.4_2.11.xml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<name>Kotlin Spark API: Examples for Spark 2.4+ (Scala 2.11)</name>
7+
<description>Example of usage</description>
8+
<artifactId>examples-2.4_2.11</artifactId>
9+
<parent>
10+
<groupId>org.jetbrains.kotlinx.spark</groupId>
11+
<artifactId>kotlin-spark-api-parent_2.11</artifactId>
12+
<version>1.0.0-preview2-SNAPSHOT</version>
13+
<relativePath>../pom_2.11.xml</relativePath>
14+
</parent>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>org.jetbrains.kotlinx.spark</groupId>
19+
<artifactId>kotlin-spark-api-2.4_${scala.compat.version}</artifactId>
20+
<version>${project.version}</version>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.apache.spark</groupId>
24+
<artifactId>spark-sql_${scala.compat.version}</artifactId>
25+
<version>${spark2.version}</version>
26+
</dependency>
27+
</dependencies>
28+
29+
<build>
30+
<sourceDirectory>src/main/kotlin</sourceDirectory>
31+
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
32+
<directory>target/${scala.compat.version}</directory>
33+
<plugins>
34+
<plugin>
35+
<groupId>org.jetbrains.kotlin</groupId>
36+
<artifactId>kotlin-maven-plugin</artifactId>
37+
</plugin>
38+
<plugin>
39+
<groupId>org.apache.maven.plugins</groupId>
40+
<artifactId>maven-assembly-plugin</artifactId>
41+
<version>${maven-assembly-plugin.version}</version>
42+
<configuration>
43+
<descriptorRefs>
44+
<descriptorRef>jar-with-dependencies</descriptorRef>
45+
</descriptorRefs>
46+
<archive>
47+
<manifest>
48+
<mainClass>org.jetbrains.spark.api.examples.WordCountKt</mainClass>
49+
</manifest>
50+
</archive>
51+
</configuration>
52+
</plugin>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-site-plugin</artifactId>
56+
<configuration>
57+
<skip>true</skip>
58+
</configuration>
59+
</plugin>
60+
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
62+
<artifactId>maven-deploy-plugin</artifactId>
63+
<configuration>
64+
<skip>true</skip>
65+
</configuration>
66+
</plugin>
67+
</plugins>
68+
</build>
69+
</project>

‎examples/pom-2.4_2.12.xml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<name>Kotlin Spark API: Examples for Spark 2.4+ (Scala 2.12)</name>
7+
<description>Example of usage</description>
8+
<artifactId>examples-2.4_2.12</artifactId>
9+
<parent>
10+
<groupId>org.jetbrains.kotlinx.spark</groupId>
11+
<artifactId>kotlin-spark-api-parent_2.12</artifactId>
12+
<version>1.0.0-preview2-SNAPSHOT</version>
13+
<relativePath>../pom_2.12.xml</relativePath>
14+
</parent>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>org.jetbrains.kotlinx.spark</groupId>
19+
<artifactId>kotlin-spark-api-2.4_${scala.compat.version}</artifactId>
20+
<version>${project.version}</version>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.apache.spark</groupId>
24+
<artifactId>spark-sql_${scala.compat.version}</artifactId>
25+
<version>${spark2.version}</version>
26+
</dependency>
27+
</dependencies>
28+
29+
<build>
30+
<sourceDirectory>src/main/kotlin</sourceDirectory>
31+
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
32+
<directory>target/${scala.compat.version}</directory>
33+
<plugins>
34+
<plugin>
35+
<groupId>org.jetbrains.kotlin</groupId>
36+
<artifactId>kotlin-maven-plugin</artifactId>
37+
</plugin>
38+
<plugin>
39+
<groupId>org.apache.maven.plugins</groupId>
40+
<artifactId>maven-assembly-plugin</artifactId>
41+
<version>${maven-assembly-plugin.version}</version>
42+
<configuration>
43+
<descriptorRefs>
44+
<descriptorRef>jar-with-dependencies</descriptorRef>
45+
</descriptorRefs>
46+
<archive>
47+
<manifest>
48+
<mainClass>org.jetbrains.spark.api.examples.WordCountKt</mainClass>
49+
</manifest>
50+
</archive>
51+
</configuration>
52+
</plugin>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-site-plugin</artifactId>
56+
<configuration>
57+
<skip>true</skip>
58+
</configuration>
59+
</plugin>
60+
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
62+
<artifactId>maven-deploy-plugin</artifactId>
63+
<configuration>
64+
<skip>true</skip>
65+
</configuration>
66+
</plugin>
67+
</plugins>
68+
</build>
69+
</project>

examples/pom_2.12.xml renamed to examples/pom-3.0_2.12.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
<modelVersion>4.0.0</modelVersion>
55

6-
<name>Kotlin Spark API: Examples (Scala 2.12)</name>
6+
<name>Kotlin Spark API: Examples for Spark 3.0+ (Scala 2.12)</name>
77
<description>Example of usage</description>
8-
<artifactId>examples_2.12</artifactId>
8+
<artifactId>examples-3.0_2.12</artifactId>
99
<parent>
1010
<groupId>org.jetbrains.kotlinx.spark</groupId>
1111
<artifactId>kotlin-spark-api-parent_2.12</artifactId>

‎kotlin-spark-api/2.4/src/main/kotlin/org/jetbrains/kotlinx/spark/api/ApiV1.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import org.apache.spark.sql.types.*
3333
import org.jetbrains.kotlinx.spark.extensions.KSparkExtensions
3434
import scala.collection.Seq
3535
import scala.reflect.ClassTag
36+
import scala.reflect.`ClassTag$`
3637
import java.beans.PropertyDescriptor
3738
import java.math.BigDecimal
3839
import java.sql.Date
@@ -115,7 +116,7 @@ private fun <T> kotlinClassEncoder(schema: DataType, kClass: KClass<*>): Encoder
115116
false,
116117
serializer.flatten() as Seq<Expression>,
117118
if (schema is DataTypeWithClass) KotlinReflection.deserializerFor(kClass.java, schema) else JavaTypeInference.deserializerFor(kClass.java),
118-
ClassTag.apply(kClass.java)
119+
`ClassTag$`.`MODULE$`.apply(kClass.java)
119120
)
120121
}
121122

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<kotest.version>4.2.5</kotest.version>
1818
<kotlin.version>1.4.10</kotlin.version>
1919
<spark2.version>2.4.0</spark2.version>
20-
<spark3.version>3.0.1</spark3.version>
20+
<spark3.version>3.0.0</spark3.version>
2121

2222
<!-- Plugin versions -->
2323
<allure-maven.version>2.10.0</allure-maven.version>

‎pom_2.11.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<modules>
2222
<module>core/2.4/pom_2.11.xml</module>
2323
<module>kotlin-spark-api/2.4/pom_2.11.xml</module>
24+
<module>examples/pom-2.4_2.11.xml</module>
2425
</modules>
2526

2627
<dependencyManagement>

‎pom_2.12.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<packaging>pom</packaging>
1515

1616
<properties>
17-
<scala.version>2.12.12</scala.version>
17+
<scala.version>2.12.10</scala.version>
1818
<scala.compat.version>2.12</scala.compat.version>
1919
</properties>
2020

@@ -23,7 +23,8 @@
2323
<module>core/3.0/pom_2.12.xml</module>
2424
<module>kotlin-spark-api/2.4/pom_2.12.xml</module>
2525
<module>kotlin-spark-api/3.0/pom_2.12.xml</module>
26-
<module>examples/pom_2.12.xml</module>
26+
<module>examples/pom-2.4_2.12.xml</module>
27+
<module>examples/pom-3.0_2.12.xml</module>
2728
</modules>
2829

2930
<dependencyManagement>

0 commit comments

Comments
 (0)