chore: 🤖 Update module names to show compatible versions

asm0dey · asm0dey · commit 4e938dfffaa2 · 2020-08-18T21:04:50.000+03:00
+ updates package names to be consitent with groupId

BREAKING CHANGE: 🧨 package, groupId and artefact renames!
diff --git a/.gitignore b/.gitignore
@@ -374,5 +374,5 @@ csvpath/
 orcpath/
 
 .env
-/kotlin-spark-api/.allure/
-/kotlin-spark-api/allure-results/
+/kotlin-spark-api-3.0.0_2.12/.allure/
+/kotlin-spark-api-3.0.0_2.12/allure-results/
diff --git a/core-3.0.0_2.12/pom.xml b/core-3.0.0_2.12/pom.xml
@@ -2,12 +2,13 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jetbrains.kotlin.spark</groupId>
+    <groupId>org.jetbrains.kotlinx.spark</groupId>
     <artifactId>kotlin-spark-api-parent</artifactId>
-    <version>1.0.0-preview1</version>
+    <version>1.0.0-preview1-SNAPSHOT</version>
   </parent>
-  <artifactId>core</artifactId>
+  <artifactId>core-3.0.0_2.12</artifactId>
   <name>Kotlin Spark API: Scala core</name>
+  <description>Scala-Spark 3.0.0 compatibility layer for Kotlin for Apache Spark</description>
 
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/core-3.0.0_2.12/src/main/scala/org/apache/spark/sql/KotlinReflection.scala b/core-3.0.0_2.12/src/main/scala/org/apache/spark/sql/KotlinReflection.scala
diff --git a/core-3.0.0_2.12/src/main/scala/org/apache/spark/sql/KotlinWrappers.scala b/core-3.0.0_2.12/src/main/scala/org/apache/spark/sql/KotlinWrappers.scala
diff --git a/core-3.0.0_2.12/src/main/scala/org/jetbrains/kotinx/spark/extensions/KSparkExtensions.scala b/core-3.0.0_2.12/src/main/scala/org/jetbrains/kotinx/spark/extensions/KSparkExtensions.scala
@@ -17,7 +17,7 @@
  * limitations under the License.
  * =LICENSEEND=
  */
-package org.jetbrains.spark.extensions
+package org.jetbrains.kotinx.spark.extensions
 
 import java.util
 
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -4,14 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.jetbrains.kotlin.spark</groupId>
+    <groupId>org.jetbrains.kotlinx.spark</groupId>
     <artifactId>kotlin-spark-api-parent</artifactId>
-    <version>1.0.0-preview1</version>
+    <version>1.0.0-preview1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.jetbrains.kotlin.spark.examples</groupId>
   <artifactId>examples</artifactId>
   <packaging>jar</packaging>
+  <description>Example of usage</description>
 
   <name>Kotlin Spark API: Examples</name>
 
@@ -22,8 +23,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jetbrains.kotlin.spark</groupId>
-      <artifactId>kotlin-spark-api</artifactId>
+      <groupId>org.jetbrains.kotlinx.spark</groupId>
+      <artifactId>kotlin-spark-api-3.0.0_2.12</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/CachedOperations.kt b/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/CachedOperations.kt
@@ -17,9 +17,9 @@
  * limitations under the License.
  * =LICENSEEND=
  */
-package org.jetbrains.spark.api.examples
+package org.jetbrains.kotlinx.spark.examples
 
-import org.jetbrains.spark.api.*
+import org.jetbrains.kotlinx.spark.api.*
 
 fun main() {
     withSpark {
diff --git a/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/Collect.kt b/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/Collect.kt
@@ -17,10 +17,10 @@
  * limitations under the License.
  * =LICENSEEND=
  */
-package org.jetbrains.spark.api.examples
+package org.jetbrains.kotlinx.spark.examples
 
 import org.apache.spark.sql.Row
-import org.jetbrains.spark.api.*
+import org.jetbrains.kotlinx.spark.api.*
 
 fun main() {
     withSpark {
diff --git a/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/Join.kt b/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/Join.kt
@@ -17,9 +17,9 @@
  * limitations under the License.
  * =LICENSEEND=
  */
-package org.jetbrains.spark.api.examples
+package org.jetbrains.kotlinx.spark.examples
 
-import org.jetbrains.spark.api.*
+import org.jetbrains.kotlinx.spark.api.*
 
 
 data class Left(val id: Int, val name: String)
diff --git a/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/Main.kt b/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/Main.kt
@@ -17,10 +17,10 @@
  * limitations under the License.
  * =LICENSEEND=
  */
-package org.jetbrains.spark.api.examples
+package org.jetbrains.kotlinx.spark.examples
 
 import org.apache.spark.api.java.function.ReduceFunction
-import org.jetbrains.spark.api.*
+import org.jetbrains.kotlinx.spark.api.*
 
 data class Q<T>(val id: Int, val text: T)
 object Main {
diff --git a/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/MapAndListOperations.kt b/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/MapAndListOperations.kt
@@ -17,9 +17,9 @@
  * limitations under the License.
  * =LICENSEEND=
  */
-package org.jetbrains.spark.api.examples
+package org.jetbrains.kotlinx.spark.examples
 
-import org.jetbrains.spark.api.*
+import org.jetbrains.kotlinx.spark.api.*
 
 fun main() {
     withSpark(props = mapOf("spark.sql.codegen.wholeStage" to true)) {
diff --git a/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/WordCount.kt b/examples/src/main/kotlin/org/jetbrains/kotlinx/spark/examples/WordCount.kt
@@ -17,10 +17,10 @@
  * limitations under the License.
  * =LICENSEEND=
  */
-package org.jetbrains.spark.api.examples
+package org.jetbrains.kotlinx.spark.examples
 
 import org.apache.spark.sql.Dataset
-import org.jetbrains.spark.api.*
+import org.jetbrains.kotlinx.spark.api.*
 
 const val MEANINGFUL_WORD_LENGTH = 4
 
diff --git a/kotlin-spark-api-3.0.0_2.12/pom.xml b/kotlin-spark-api-3.0.0_2.12/pom.xml
@@ -4,15 +4,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.jetbrains.kotlin.spark</groupId>
+    <groupId>org.jetbrains.kotlinx.spark</groupId>
     <artifactId>kotlin-spark-api-parent</artifactId>
-    <version>1.0.0-preview1</version>
+    <version>1.0.0-preview1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kotlin-spark-api</artifactId>
+  <artifactId>kotlin-spark-api-3.0.0_2.12</artifactId>
   <packaging>jar</packaging>
 
   <name>Kotlin Spark API</name>
+  <description>Kotlin API compatible with spark 3.0.0 Kotlin for Apache Spark</description>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -33,8 +34,8 @@
       <version>${kotlin.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jetbrains.kotlin.spark</groupId>
-      <artifactId>core</artifactId>
+      <groupId>org.jetbrains.kotlinx.spark</groupId>
+      <artifactId>core-3.0.0_2.12</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
     <dependency>
@@ -162,10 +163,10 @@
           </execution>
           <execution>
             <id>report</id>
-            <phase>prepare-package</phase>
             <goals>
               <goal>report</goal>
             </goals>
+            <phase>prepare-package</phase>
           </execution>
         </executions>
       </plugin>
diff --git a/kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/ApiV1.kt b/kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/ApiV1.kt
@@ -19,15 +19,15 @@
  */
 @file:Suppress("HasPlatformType", "unused", "FunctionName")
 
-package org.jetbrains.spark.api
+package org.jetbrains.kotlinx.spark.api
 
 import org.apache.spark.SparkContext
 import org.apache.spark.api.java.function.*
 import org.apache.spark.sql.*
 import org.apache.spark.sql.Encoders.*
 import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
 import org.apache.spark.sql.types.*
-import org.jetbrains.spark.extensions.KSparkExtensions
+import org.jetbrains.kotinx.spark.extensions.KSparkExtensions
 import scala.reflect.ClassTag
 import java.beans.PropertyDescriptor
 import java.math.BigDecimal
diff --git a/kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/Iterators.kt b/kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/Iterators.kt
@@ -17,7 +17,7 @@
  * limitations under the License.
  * =LICENSEEND=
  */
-package org.jetbrains.spark.api
+package org.jetbrains.kotlinx.spark.api
 
 class PartitioningIterator<T>(
     private val source: Iterator<T>,
diff --git a/kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/SparkHelper.kt b/kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/SparkHelper.kt
@@ -17,10 +17,10 @@
  * limitations under the License.
  * =LICENSEEND=
  */
-package org.jetbrains.spark.api
+package org.jetbrains.kotlinx.spark.api
 
 import org.apache.spark.sql.SparkSession.Builder
-import org.jetbrains.spark.api.SparkLogLevel.ERROR
+import org.jetbrains.kotlinx.spark.api.SparkLogLevel.ERROR
 
 /**
  * Wrapper for spark creation which allows to set different spark params
diff --git a/kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/VarArities.kt b/kotlin-spark-api-3.0.0_2.12/src/main/kotlin/org/jetbrains/kotlinx/spark/api/VarArities.kt
@@ -20,7 +20,7 @@
 /**
  * Helper classes and functions to work with unnamed tuples
  */
-package org.jetbrains.spark.api
+package org.jetbrains.kotlinx.spark.api
 
 data class Arity1<T1>(val _1: T1)
 data class Arity2<T1, T2>(val _1: T1, val _2: T2)
diff --git a/kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/ApiTest.kt b/kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/ApiTest.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.spark.api/*-
+package org.jetbrains.kotlinx.spark.api/*-
  * =LICENSE=
  * Kotlin Spark API
  * ----------
diff --git a/kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/ProjectConfig.kt b/kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/ProjectConfig.kt
@@ -17,11 +17,12 @@
  * limitations under the License.
  * =LICENSEEND=
  */
-package org.jetbrains.spark.api
+package org.jetbrains.kotlinx.spark.api
 
 import io.kotest.core.config.AbstractProjectConfig
-import io.kotest.extensions.allure.AllureTestListener
+import io.kotest.extensions.allure.AllureTestReporter
 
+@Suppress("unused")
 object ProjectConfig : AbstractProjectConfig() {
-    override fun listeners() = super.listeners() + AllureTestListener
+    override fun listeners() = super.listeners() + AllureTestReporter(true)
 }
diff --git a/kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/TypeInferenceTest.kt b/kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/TypeInferenceTest.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.spark.api/*-
+package org.jetbrains.kotlinx.spark.api/*-
  * =LICENSE=
  * Kotlin Spark API
  * ----------
@@ -22,12 +22,12 @@ import ch.tutteli.atrium.creating.Expect
 import ch.tutteli.atrium.domain.builders.migration.asExpect
 import ch.tutteli.atrium.verbs.expect
 import io.kotest.core.spec.style.ShouldSpec
-import org.jetbrains.spark.api.struct.model.DataType.StructType
-import org.jetbrains.spark.api.struct.model.DataType.TypeName
-import org.jetbrains.spark.api.struct.model.ElementType.ComplexElement
-import org.jetbrains.spark.api.struct.model.ElementType.SimpleElement
-import org.jetbrains.spark.api.struct.model.Struct
-import org.jetbrains.spark.api.struct.model.StructField
+import org.jetbrains.kotlinx.spark.api.struct.model.DataType.StructType
+import org.jetbrains.kotlinx.spark.api.struct.model.DataType.TypeName
+import org.jetbrains.kotlinx.spark.api.struct.model.ElementType.ComplexElement
+import org.jetbrains.kotlinx.spark.api.struct.model.ElementType.SimpleElement
+import org.jetbrains.kotlinx.spark.api.struct.model.Struct
+import org.jetbrains.kotlinx.spark.api.struct.model.StructField
 import java.util.*
 import kotlin.reflect.typeOf
 
diff --git a/kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/struct/model/models.kt b/kotlin-spark-api-3.0.0_2.12/src/test/kotlin/org/jetbrains/kotlinx/spark/api/struct/model/models.kt
@@ -17,7 +17,7 @@
  * limitations under the License.
  * =LICENSEEND=
  */
-package org.jetbrains.spark.api.struct.model
+package org.jetbrains.kotlinx.spark.api.struct.model
 
 import com.beust.klaxon.*
 
diff --git a/pom.xml b/pom.xml
