Skip to content

Commit 4e938df

Browse files
asm0deyasm0dey
committed
chore: 🤖 Update module names to show compatible versions
+ updates package names to be consitent with groupId BREAKING CHANGE: 🧨 package, groupId and artefact renames!
1 parent 66ae60e commit 4e938df

File tree

22 files changed

+109
-58
lines changed

22 files changed

+109
-58
lines changed

Diff for: ‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -374,5 +374,5 @@ csvpath/
374374
orcpath/
375375

376376
.env
377-
/kotlin-spark-api/.allure/
378-
/kotlin-spark-api/allure-results/
377+
/kotlin-spark-api-3.0.0_2.12/.allure/
378+
/kotlin-spark-api-3.0.0_2.12/allure-results/

Diff for: ‎core/pom.xml renamed to ‎core-3.0.0_2.12/pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>org.jetbrains.kotlin.spark</groupId>
5+
<groupId>org.jetbrains.kotlinx.spark</groupId>
66
<artifactId>kotlin-spark-api-parent</artifactId>
7-
<version>1.0.0-preview1</version>
7+
<version>1.0.0-preview1-SNAPSHOT</version>
88
</parent>
9-
<artifactId>core</artifactId>
9+
<artifactId>core-3.0.0_2.12</artifactId>
1010
<name>Kotlin Spark API: Scala core</name>
11+
<description>Scala-Spark 3.0.0 compatibility layer for Kotlin for Apache Spark</description>
1112

1213
<properties>
1314
<maven.compiler.source>1.8</maven.compiler.source>

Diff for: ‎core/src/main/scala/org/apache/spark/sql/KotlinReflection.scala renamed to ‎core-3.0.0_2.12/src/main/scala/org/apache/spark/sql/KotlinReflection.scala

File renamed without changes.

Diff for: ‎core/src/main/scala/org/apache/spark/sql/KotlinWrappers.scala renamed to ‎core-3.0.0_2.12/src/main/scala/org/apache/spark/sql/KotlinWrappers.scala

File renamed without changes.

Diff for: ‎core/src/main/scala/org/jetbrains/spark/extensions/KSparkExtensions.scala renamed to ‎core-3.0.0_2.12/src/main/scala/org/jetbrains/kotinx/spark/extensions/KSparkExtensions.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* limitations under the License.
1818
* =LICENSEEND=
1919
*/
20-
package org.jetbrains.spark.extensions
20+
package org.jetbrains.kotinx.spark.extensions
2121

2222
import java.util
2323

Diff for: ‎examples/pom.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<parent>
7-
<groupId>org.jetbrains.kotlin.spark</groupId>
7+
<groupId>org.jetbrains.kotlinx.spark</groupId>
88
<artifactId>kotlin-spark-api-parent</artifactId>
9-
<version>1.0.0-preview1</version>
9+
<version>1.0.0-preview1-SNAPSHOT</version>
1010
</parent>
1111

1212
<groupId>org.jetbrains.kotlin.spark.examples</groupId>
1313
<artifactId>examples</artifactId>
1414
<packaging>jar</packaging>
15+
<description>Example of usage</description>
1516

1617
<name>Kotlin Spark API: Examples</name>
1718

@@ -22,8 +23,8 @@
2223

2324
<dependencies>
2425
<dependency>
25-
<groupId>org.jetbrains.kotlin.spark</groupId>
26-
<artifactId>kotlin-spark-api</artifactId>
26+
<groupId>org.jetbrains.kotlinx.spark</groupId>
27+
<artifactId>kotlin-spark-api-3.0.0_2.12</artifactId>
2728
<version>${project.version}</version>
2829
</dependency>
2930
<dependency>

Diff for: ‎examples/src/main/kotlin/org/jetbrains/spark/api/examples/CachedOperations.kt renamed to ‎examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/CachedOperations.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* limitations under the License.
1818
* =LICENSEEND=
1919
*/
20-
package org.jetbrains.spark.api.examples
20+
package org.jetbrains.kotlinx.spark.examples
2121

22-
import org.jetbrains.spark.api.*
22+
import org.jetbrains.kotlinx.spark.api.*
2323

2424
fun main() {
2525
withSpark {

Diff for: ‎examples/src/main/kotlin/org/jetbrains/spark/api/examples/Collect.kt renamed to ‎examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/Collect.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* limitations under the License.
1818
* =LICENSEEND=
1919
*/
20-
package org.jetbrains.spark.api.examples
20+
package org.jetbrains.kotlinx.spark.examples
2121

2222
import org.apache.spark.sql.Row
23-
import org.jetbrains.spark.api.*
23+
import org.jetbrains.kotlinx.spark.api.*
2424

2525
fun main() {
2626
withSpark {

Diff for: ‎examples/src/main/kotlin/org/jetbrains/spark/api/examples/Join.kt renamed to ‎examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/Join.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* limitations under the License.
1818
* =LICENSEEND=
1919
*/
20-
package org.jetbrains.spark.api.examples
20+
package org.jetbrains.kotlinx.spark.examples
2121

22-
import org.jetbrains.spark.api.*
22+
import org.jetbrains.kotlinx.spark.api.*
2323

2424

2525
data class Left(val id: Int, val name: String)

Diff for: ‎examples/src/main/kotlin/org/jetbrains/spark/api/examples/Main.kt renamed to ‎examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/Main.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* limitations under the License.
1818
* =LICENSEEND=
1919
*/
20-
package org.jetbrains.spark.api.examples
20+
package org.jetbrains.kotlinx.spark.examples
2121

2222
import org.apache.spark.api.java.function.ReduceFunction
23-
import org.jetbrains.spark.api.*
23+
import org.jetbrains.kotlinx.spark.api.*
2424

2525
data class Q<T>(val id: Int, val text: T)
2626
object Main {

Diff for: ‎examples/src/main/kotlin/org/jetbrains/spark/api/examples/MapAndListOperations.kt renamed to ‎examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/MapAndListOperations.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* limitations under the License.
1818
* =LICENSEEND=
1919
*/
20-
package org.jetbrains.spark.api.examples
20+
package org.jetbrains.kotlinx.spark.examples
2121

22-
import org.jetbrains.spark.api.*
22+
import org.jetbrains.kotlinx.spark.api.*
2323

2424
fun main() {
2525
withSpark(props = mapOf("spark.sql.codegen.wholeStage" to true)) {

Diff for: ‎examples/src/main/kotlin/org/jetbrains/spark/api/examples/WordCount.kt renamed to ‎examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/WordCount.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* limitations under the License.
1818
* =LICENSEEND=
1919
*/
20-
package org.jetbrains.spark.api.examples
20+
package org.jetbrains.kotlinx.spark.examples
2121

2222
import org.apache.spark.sql.Dataset
23-
import org.jetbrains.spark.api.*
23+
import org.jetbrains.kotlinx.spark.api.*
2424

2525
const val MEANINGFUL_WORD_LENGTH = 4
2626

Diff for: ‎kotlin-spark-api/pom.xml renamed to ‎kotlin-spark-api-3.0.0_2.12/pom.xml

+7-6
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<parent>
7-
<groupId>org.jetbrains.kotlin.spark</groupId>
7+
<groupId>org.jetbrains.kotlinx.spark</groupId>
88
<artifactId>kotlin-spark-api-parent</artifactId>
9-
<version>1.0.0-preview1</version>
9+
<version>1.0.0-preview1-SNAPSHOT</version>
1010
</parent>
1111

12-
<artifactId>kotlin-spark-api</artifactId>
12+
<artifactId>kotlin-spark-api-3.0.0_2.12</artifactId>
1313
<packaging>jar</packaging>
1414

1515
<name>Kotlin Spark API</name>
16+
<description>Kotlin API compatible with spark 3.0.0 Kotlin for Apache Spark</description>
1617

1718
<properties>
1819
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -33,8 +34,8 @@
3334
<version>${kotlin.version}</version>
3435
</dependency>
3536
<dependency>
36-
<groupId>org.jetbrains.kotlin.spark</groupId>
37-
<artifactId>core</artifactId>
37+
<groupId>org.jetbrains.kotlinx.spark</groupId>
38+
<artifactId>core-3.0.0_2.12</artifactId>
3839
<version>${project.parent.version}</version>
3940
</dependency>
4041
<dependency>
@@ -162,10 +163,10 @@
162163
</execution>
163164
<execution>
164165
<id>report</id>
165-
<phase>prepare-package</phase>
166166
<goals>
167167
<goal>report</goal>
168168
</goals>
169+
<phase>prepare-package</phase>
169170
</execution>
170171
</executions>
171172
</plugin>

Diff for: ‎kotlin-spark-api/src/main/kotlin/org/jetbrains/spark/api/ApiV1.kt renamed to ‎kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/ApiV1.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
*/
2020
@file:Suppress("HasPlatformType", "unused", "FunctionName")
2121

22-
package org.jetbrains.spark.api
22+
package org.jetbrains.kotlinx.spark.api
2323

2424
import org.apache.spark.SparkContext
2525
import org.apache.spark.api.java.function.*
2626
import org.apache.spark.sql.*
2727
import org.apache.spark.sql.Encoders.*
2828
import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
2929
import org.apache.spark.sql.types.*
30-
import org.jetbrains.spark.extensions.KSparkExtensions
30+
import org.jetbrains.kotinx.spark.extensions.KSparkExtensions
3131
import scala.reflect.ClassTag
3232
import java.beans.PropertyDescriptor
3333
import java.math.BigDecimal

Diff for: ‎kotlin-spark-api/src/main/kotlin/org/jetbrains/spark/api/Iterators.kt renamed to ‎kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/Iterators.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* limitations under the License.
1818
* =LICENSEEND=
1919
*/
20-
package org.jetbrains.spark.api
20+
package org.jetbrains.kotlinx.spark.api
2121

2222
class PartitioningIterator<T>(
2323
private val source: Iterator<T>,

Diff for: ‎kotlin-spark-api/src/main/kotlin/org/jetbrains/spark/api/SparkHelper.kt renamed to ‎kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/SparkHelper.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* limitations under the License.
1818
* =LICENSEEND=
1919
*/
20-
package org.jetbrains.spark.api
20+
package org.jetbrains.kotlinx.spark.api
2121

2222
import org.apache.spark.sql.SparkSession.Builder
23-
import org.jetbrains.spark.api.SparkLogLevel.ERROR
23+
import org.jetbrains.kotlinx.spark.api.SparkLogLevel.ERROR
2424

2525
/**
2626
* Wrapper for spark creation which allows to set different spark params

Diff for: ‎kotlin-spark-api/src/main/kotlin/org/jetbrains/spark/api/VarArities.kt renamed to ‎kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/VarArities.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/**
2121
* Helper classes and functions to work with unnamed tuples
2222
*/
23-
package org.jetbrains.spark.api
23+
package org.jetbrains.kotlinx.spark.api
2424

2525
data class Arity1<T1>(val _1: T1)
2626
data class Arity2<T1, T2>(val _1: T1, val _2: T2)

Diff for: ‎kotlin-spark-api/src/test/kotlin/org/jetbrains/spark/api/ApiTest.kt renamed to ‎kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/ApiTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jetbrains.spark.api/*-
1+
package org.jetbrains.kotlinx.spark.api/*-
22
* =LICENSE=
33
* Kotlin Spark API
44
* ----------

Diff for: ‎kotlin-spark-api/src/test/kotlin/org/jetbrains/spark/api/ProjectConfig.kt renamed to ‎kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/ProjectConfig.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
* limitations under the License.
1818
* =LICENSEEND=
1919
*/
20-
package org.jetbrains.spark.api
20+
package org.jetbrains.kotlinx.spark.api
2121

2222
import io.kotest.core.config.AbstractProjectConfig
23-
import io.kotest.extensions.allure.AllureTestListener
23+
import io.kotest.extensions.allure.AllureTestReporter
2424

25+
@Suppress("unused")
2526
object ProjectConfig : AbstractProjectConfig() {
26-
override fun listeners() = super.listeners() + AllureTestListener
27+
override fun listeners() = super.listeners() + AllureTestReporter(true)
2728
}

Diff for: ‎kotlin-spark-api/src/test/kotlin/org/jetbrains/spark/api/TypeInferenceTest.kt renamed to ‎kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/TypeInferenceTest.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jetbrains.spark.api/*-
1+
package org.jetbrains.kotlinx.spark.api/*-
22
* =LICENSE=
33
* Kotlin Spark API
44
* ----------
@@ -22,12 +22,12 @@ import ch.tutteli.atrium.creating.Expect
2222
import ch.tutteli.atrium.domain.builders.migration.asExpect
2323
import ch.tutteli.atrium.verbs.expect
2424
import io.kotest.core.spec.style.ShouldSpec
25-
import org.jetbrains.spark.api.struct.model.DataType.StructType
26-
import org.jetbrains.spark.api.struct.model.DataType.TypeName
27-
import org.jetbrains.spark.api.struct.model.ElementType.ComplexElement
28-
import org.jetbrains.spark.api.struct.model.ElementType.SimpleElement
29-
import org.jetbrains.spark.api.struct.model.Struct
30-
import org.jetbrains.spark.api.struct.model.StructField
25+
import org.jetbrains.kotlinx.spark.api.struct.model.DataType.StructType
26+
import org.jetbrains.kotlinx.spark.api.struct.model.DataType.TypeName
27+
import org.jetbrains.kotlinx.spark.api.struct.model.ElementType.ComplexElement
28+
import org.jetbrains.kotlinx.spark.api.struct.model.ElementType.SimpleElement
29+
import org.jetbrains.kotlinx.spark.api.struct.model.Struct
30+
import org.jetbrains.kotlinx.spark.api.struct.model.StructField
3131
import java.util.*
3232
import kotlin.reflect.typeOf
3333

Diff for: ‎kotlin-spark-api/src/test/kotlin/org/jetbrains/spark/api/struct/model/models.kt renamed to ‎kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/struct/model/models.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* limitations under the License.
1818
* =LICENSEEND=
1919
*/
20-
package org.jetbrains.spark.api.struct.model
20+
package org.jetbrains.kotlinx.spark.api.struct.model
2121

2222
import com.beust.klaxon.*
2323

0 commit comments

Comments
 (0)