From ae28e64fa6f853b9c2ce5ebc5313f24f5f3f2c27 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 5 Jan 2023 13:48:46 +0100 Subject: [PATCH 1/5] Remove snapshot from version --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 83bdddf1..d5400394 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,5 +1,5 @@ object Versions { - const val project = "1.2.3-SNAPSHOT" + const val project = "1.2.3" const val groupID = "org.jetbrains.kotlinx.spark" const val kotlin = "1.8.0" const val jvmTarget = "8" From bbde39a35a587127e4e37d4bb6b511e7f4048c0d Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 5 Jan 2023 14:03:14 +0100 Subject: [PATCH 2/5] Update quick-start-guide.md --- docs/quick-start-guide.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/quick-start-guide.md b/docs/quick-start-guide.md index e57105ec..25a55be7 100644 --- a/docs/quick-start-guide.md +++ b/docs/quick-start-guide.md @@ -60,7 +60,7 @@ Here's what the `pom.xml` looks like for this example: UTF-8 - 1.4.0 + 1.8.0 official @@ -73,7 +73,7 @@ Here's what the `pom.xml` looks like for this example: org.jetbrains.kotlinx.spark kotlin-spark-api_3.3.1_2.13 - 1.2.2 + 1.2.3 org.apache.spark @@ -161,9 +161,9 @@ repositories { dependencies { // Kotlin stdlib - implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.0' + implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.0' // Kotlin Spark API - implementation 'org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.1_2.13:1.2.2' // Apache Spark + implementation 'org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.1_2.13:1.2.3' // Apache Spark compileOnly 'org.apache.spark:spark-sql_2.12:3.3.1' } @@ -186,7 +186,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id ("org.jetbrains.kotlin.jvm") version "1.4.0" + id ("org.jetbrains.kotlin.jvm") version "1.8.0" id ("com.github.johnrengelman.shadow") version "5.2.0" } @@ -198,7 +198,7 @@ dependencies { // Kotlin stdlib implementation ("org.jetbrains.kotlin:kotlin-stdlib:1.4.0") // Kotlin Spark API - implementation ("org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.1_2.13:1.2.2") + implementation ("org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.1_2.13:1.2.3") // Apache Spark compileOnly ("org.apache.spark:spark-sql_2.12:3.3.1") } From e48464e7e981e354c49a2d62914beb157d28fa57 Mon Sep 17 00:00:00 2001 From: dgleeson Date: Thu, 20 Jul 2023 16:04:12 -0700 Subject: [PATCH 3/5] Update spark to 3.3.2 --- .github/workflows/build.yml | 2 +- .github/workflows/publish_dev_version.yml | 2 +- .github/workflows/publish_release_version.yml | 2 +- README.md | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 693a8bdd..f770318f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: scala: [ "2.12.17", "2.13.10" ] - spark: [ "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ] + spark: [ "3.3.2", "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ] exclude: - scala: "2.13.10" spark: "3.1.3" diff --git a/.github/workflows/publish_dev_version.yml b/.github/workflows/publish_dev_version.yml index 19f8d4f1..4e2ab716 100644 --- a/.github/workflows/publish_dev_version.yml +++ b/.github/workflows/publish_dev_version.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: scala: [ "2.12.17", "2.13.10" ] - spark: [ "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ] + spark: [ "3.3.2", "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ] exclude: - scala: "2.13.10" spark: "3.1.3" diff --git a/.github/workflows/publish_release_version.yml b/.github/workflows/publish_release_version.yml index 3283e665..ea1998ed 100644 --- a/.github/workflows/publish_release_version.yml +++ b/.github/workflows/publish_release_version.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: scala: [ "2.12.17", "2.13.10" ] - spark: [ "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ] + spark: [ "3.3.2", "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ] exclude: - scala: "2.13.10" spark: "3.1.3" diff --git a/README.md b/README.md index 5a1fd136..8e8e79fa 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,8 @@ We have opened a Spark Project Improvement Proposal: [Kotlin support for Apache | Apache Spark | Scala | Kotlin for Apache Spark | |:------------:|:-----:|:-----------------------------------:| +| 3.3.2 | 2.13 | kotlin-spark-api_3.3.2_2.13:VERSION | +| | 2.12 | kotlin-spark-api_3.3.2_2.12:VERSION | | 3.3.1 | 2.13 | kotlin-spark-api_3.3.1_2.13:VERSION | | | 2.12 | kotlin-spark-api_3.3.1_2.12:VERSION | | 3.3.0 | 2.13 | kotlin-spark-api_3.3.0_2.13:VERSION | From e06ed3451b0a0286b374b627b16ccd563ab9a5d5 Mon Sep 17 00:00:00 2001 From: dgleeson Date: Fri, 21 Jul 2023 14:06:20 -0700 Subject: [PATCH 4/5] update gradle.properties to reflect spark 3.3.2 version change --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 416269d3..bcfebf83 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,11 +7,11 @@ GROUP=org.jetbrains.kotlinx.spark # Controls the spark and scala version for the entire project # can also be defined like ./gradlew -Pspark=X.X.X -Pscala=X.X.X build -spark=3.3.1 +spark=3.3.2 scala=2.13.10 # scala=2.12.17 skipScalaTuplesInKotlin=false org.gradle.caching=true org.gradle.parallel=false -#kotlin.incremental.useClasspathSnapshot=true \ No newline at end of file +#kotlin.incremental.useClasspathSnapshot=true From f7f351e488a50fda26d38a8f3a05b8256bf60da4 Mon Sep 17 00:00:00 2001 From: dgleeson Date: Fri, 21 Jul 2023 14:11:42 -0700 Subject: [PATCH 5/5] update docs to reflect spark update --- README.md | 8 ++++---- docs/quick-start-guide.md | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e681e9b4..88cc6289 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Kotlin Stable](https://kotl.in/badges/stable.svg)](https://kotlinlang.org/docs/components-stability.html) [![JetBrains official project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) -[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx.spark/kotlin-spark-api_3.3.1_2.13.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:"org.jetbrains.kotlinx.spark"%20AND%20a:"kotlin-spark-api_3.3.1_2.13") +[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx.spark/kotlin-spark-api_3.3.2_2.13.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:"org.jetbrains.kotlinx.spark"%20AND%20a:"kotlin-spark-api_3.3.2_2.13") [![Join the chat at https://gitter.im/JetBrains/kotlin-spark-api](https://badges.gitter.im/JetBrains/kotlin-spark-api.svg)](https://gitter.im/JetBrains/kotlin-spark-api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) Your next API to work with [Apache Spark](https://spark.apache.org/). @@ -75,7 +75,7 @@ The Kotlin for Spark artifacts adhere to the following convention: The only exception to this is `scala-tuples-in-kotlin_[Scala core version]:[Kotlin for Apache Spark API version]`, which is independent of Spark. -[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx.spark/kotlin-spark-api_3.3.1_2.13.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:"org.jetbrains.kotlinx.spark"%20AND%20a:"kotlin-spark-api_3.3.1_2.13") +[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx.spark/kotlin-spark-api_3.3.2_2.13.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:"org.jetbrains.kotlinx.spark"%20AND%20a:"kotlin-spark-api_3.3.2_2.13") ## How to configure Kotlin for Apache Spark in your project @@ -86,7 +86,7 @@ Here's an example `pom.xml`: ```xml org.jetbrains.kotlinx.spark - kotlin-spark-api_3.3.1_2.13 + kotlin-spark-api_3.3.2_2.13 ${kotlin-spark-api.version} @@ -119,7 +119,7 @@ To it, simply add to the top of your notebook. This will get the latest version of the API, together with the latest version of Spark. To define a certain version of Spark or the API itself, simply add it like this: ```jupyterpython -%use spark(spark=3.3.1, scala=2.13, v=1.2.3) +%use spark(spark=3.3.2, scala=2.13, v=1.2.3) ``` Inside the notebook a Spark session will be initiated automatically. This can be accessed via the `spark` value. diff --git a/docs/quick-start-guide.md b/docs/quick-start-guide.md index 25a55be7..66d8e655 100644 --- a/docs/quick-start-guide.md +++ b/docs/quick-start-guide.md @@ -72,13 +72,13 @@ Here's what the `pom.xml` looks like for this example: org.jetbrains.kotlinx.spark - kotlin-spark-api_3.3.1_2.13 + kotlin-spark-api_3.3.2_2.13 1.2.3 org.apache.spark spark-sql_2.12 - 3.3.1 + 3.3.2 @@ -163,8 +163,8 @@ dependencies { // Kotlin stdlib implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.0' // Kotlin Spark API - implementation 'org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.1_2.13:1.2.3' // Apache Spark - compileOnly 'org.apache.spark:spark-sql_2.12:3.3.1' + implementation 'org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.2_2.13:1.2.3' // Apache Spark + compileOnly 'org.apache.spark:spark-sql_2.12:3.3.2' } compileKotlin { @@ -198,9 +198,9 @@ dependencies { // Kotlin stdlib implementation ("org.jetbrains.kotlin:kotlin-stdlib:1.4.0") // Kotlin Spark API - implementation ("org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.1_2.13:1.2.3") + implementation ("org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.2_2.13:1.2.3") // Apache Spark - compileOnly ("org.apache.spark:spark-sql_2.12:3.3.1") + compileOnly ("org.apache.spark:spark-sql_2.12:3.3.2") } compileKotlin.kotlinOptions.jvmTarget = "1.8"