Skip to content

Commit

Permalink
chore: 🤖 Update module names to show compatible versions
Browse files Browse the repository at this point in the history
+ updates package names to be consitent with groupId

BREAKING CHANGE: 🧨 package, groupId and artefact renames!
  • Loading branch information
asm0dey committed Aug 18, 2020
1 parent 66ae60e commit 4e938df
Show file tree
Hide file tree
Showing 22 changed files with 109 additions and 58 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/
7 changes: 4 additions & 3 deletions core/pom.xml → core-3.0.0_2.12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
* =LICENSEEND=
*/
package org.jetbrains.spark.extensions
package org.jetbrains.kotinx.spark.extensions

import java.util

Expand Down
9 changes: 5 additions & 4 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 7 additions & 6 deletions kotlin-spark-api/pom.xml → kotlin-spark-api-3.0.0_2.12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jetbrains.spark.api/*-
package org.jetbrains.kotlinx.spark.api/*-
* =LICENSE=
* Kotlin Spark API
* ----------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jetbrains.spark.api/*-
package org.jetbrains.kotlinx.spark.api/*-
* =LICENSE=
* Kotlin Spark API
* ----------
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Loading

0 comments on commit 4e938df

Please sign in to comment.