From 8a5a019054e2bedfe6e180e97c268dcd70ae287f Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 17 Oct 2022 22:08:01 +0200 Subject: [PATCH 01/31] testing to see what runs on java 8 --- .github/workflows/build.yml | 4 ++-- .github/workflows/publish_dev_version.yml | 4 ++-- .github/workflows/publish_release_version.yml | 4 ++-- buildSrc/src/main/kotlin/Versions.kt | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 640dce15..6274a5cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,11 +34,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 8 uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 8 check-latest: true - name: Cache Gradle packages diff --git a/.github/workflows/publish_dev_version.yml b/.github/workflows/publish_dev_version.yml index 08f6d0d1..1a235613 100644 --- a/.github/workflows/publish_dev_version.yml +++ b/.github/workflows/publish_dev_version.yml @@ -36,11 +36,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 8 uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 8 check-latest: true - name: Cache Gradle packages diff --git a/.github/workflows/publish_release_version.yml b/.github/workflows/publish_release_version.yml index 12534d50..cbffa337 100644 --- a/.github/workflows/publish_release_version.yml +++ b/.github/workflows/publish_release_version.yml @@ -38,11 +38,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 8 uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 8 check-latest: true - name: Cache Gradle packages diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 158759be..ec3e443a 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,8 +1,8 @@ object Versions { const val project = "1.2.2-SNAPSHOT" const val groupID = "org.jetbrains.kotlinx.spark" - const val kotlin = "1.7.10" - const val jvmTarget = "11" + const val kotlin = "1.7.20" + const val jvmTarget = "8" inline val spark get() = System.getProperty("spark") as String inline val scala get() = System.getProperty("scala") as String @@ -12,7 +12,7 @@ object Versions { const val jupyter = "0.11.0-134" const val kotest = "5.3.2" const val kotestTestContainers = "1.3.3" - const val dokka = "1.7.10" + const val dokka = "1.7.20" const val jcp = "7.0.5" const val mavenPublish = "0.20.0" const val atrium = "0.17.0" From 6b111ed837e904a6c41b68e29a22b7c247201c35 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 17 Oct 2022 22:26:27 +0200 Subject: [PATCH 02/31] making jupyter module run on java 11, the rest on 8 --- buildSrc/src/main/kotlin/Versions.kt | 3 ++- jupyter/build.gradle.kts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index ec3e443a..fb418034 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -3,13 +3,14 @@ object Versions { const val groupID = "org.jetbrains.kotlinx.spark" const val kotlin = "1.7.20" const val jvmTarget = "8" + const val jupyterJvmTarget = "11" inline val spark get() = System.getProperty("spark") as String inline val scala get() = System.getProperty("scala") as String inline val sparkMinor get() = spark.substringBeforeLast('.') inline val scalaCompat get() = scala.substringBeforeLast('.') - const val jupyter = "0.11.0-134" + const val jupyter = "0.11.0-171-1" const val kotest = "5.3.2" const val kotestTestContainers = "1.3.3" const val dokka = "1.7.20" diff --git a/jupyter/build.gradle.kts b/jupyter/build.gradle.kts index 4e7c8e48..7ba1437e 100644 --- a/jupyter/build.gradle.kts +++ b/jupyter/build.gradle.kts @@ -139,7 +139,7 @@ tasks.compileTestKotlin { kotlin { jvmToolchain { languageVersion.set( - JavaLanguageVersion.of(Versions.jvmTarget) + JavaLanguageVersion.of(Versions.jupyterJvmTarget) ) } } From 9294a8ff0c5a51a8105a23584e77a38d6a341962 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 17 Oct 2022 22:36:21 +0200 Subject: [PATCH 03/31] restore gradle jdk version --- .github/workflows/build.yml | 4 ++-- .github/workflows/publish_dev_version.yml | 4 ++-- .github/workflows/publish_release_version.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6274a5cf..640dce15 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,11 +34,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: distribution: adopt - java-version: 8 + java-version: 11 check-latest: true - name: Cache Gradle packages diff --git a/.github/workflows/publish_dev_version.yml b/.github/workflows/publish_dev_version.yml index 1a235613..08f6d0d1 100644 --- a/.github/workflows/publish_dev_version.yml +++ b/.github/workflows/publish_dev_version.yml @@ -36,11 +36,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: distribution: adopt - java-version: 8 + java-version: 11 check-latest: true - name: Cache Gradle packages diff --git a/.github/workflows/publish_release_version.yml b/.github/workflows/publish_release_version.yml index cbffa337..12534d50 100644 --- a/.github/workflows/publish_release_version.yml +++ b/.github/workflows/publish_release_version.yml @@ -38,11 +38,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: distribution: adopt - java-version: 8 + java-version: 11 check-latest: true - name: Cache Gradle packages From 4c35f47c163610321a1f9810900a1073dd68ed19 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 1 Dec 2022 15:19:57 +0100 Subject: [PATCH 04/31] bumping version to 1.2.3-SNAPSHOT --- 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 998b08ce..d88e4dac 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.2-SNAPSHOT" + const val project = "1.2.3-SNAPSHOT" const val groupID = "org.jetbrains.kotlinx.spark" const val kotlin = "1.7.20" const val jvmTarget = "11" From bf6f3a9ba2091baa32f67588bb6d2ef0cbcf4177 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Wed, 28 Dec 2022 14:51:12 +0100 Subject: [PATCH 05/31] updating to kotlin 1.8.0-RC2, fixed OOM error, fixed udf tests --- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- gradle.properties | 4 ++-- jupyter/build.gradle.kts | 1 + kotlin-spark-api/build.gradle.kts | 1 + .../kotlin/org/jetbrains/kotlinx/spark/api/UDFTest.kt | 11 ++++++----- scala-tuples-in-kotlin/build.gradle.kts | 1 + 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index b74ee9c2..6444233d 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { const val project = "1.2.3-SNAPSHOT" const val groupID = "org.jetbrains.kotlinx.spark" - const val kotlin = "1.7.20" + const val kotlin = "1.8.0-RC2" const val jvmTarget = "8" const val jupyterJvmTarget = "11" @@ -11,7 +11,7 @@ object Versions { inline val scalaCompat get() = scala.substringBeforeLast('.') const val jupyter = "0.11.0-134" - const val kotest = "5.3.2" + const val kotest = "5.5.4" const val kotestTestContainers = "1.3.3" const val dokka = "1.7.10" const val jcp = "7.0.5" diff --git a/gradle.properties b/gradle.properties index f5dff2e2..416269d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -kotlin.daemon.jvmargs=-Xmx10G -org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=1G -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +kotlin.daemon.jvmargs=-Xmx8g +org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 mavenCentralUsername=dummy mavenCentralPassword=dummy diff --git a/jupyter/build.gradle.kts b/jupyter/build.gradle.kts index e3b5a8ef..103890da 100644 --- a/jupyter/build.gradle.kts +++ b/jupyter/build.gradle.kts @@ -26,6 +26,7 @@ repositories { tasks.withType().configureEach { useJUnitPlatform() + maxHeapSize = "8g" } tasks.processJupyterApiResources { diff --git a/kotlin-spark-api/build.gradle.kts b/kotlin-spark-api/build.gradle.kts index fada9d68..2691836a 100644 --- a/kotlin-spark-api/build.gradle.kts +++ b/kotlin-spark-api/build.gradle.kts @@ -23,6 +23,7 @@ repositories { tasks.withType().configureEach { useJUnitPlatform() + maxHeapSize = "8g" } dependencies { diff --git a/kotlin-spark-api/src/test/kotlin/org/jetbrains/kotlinx/spark/api/UDFTest.kt b/kotlin-spark-api/src/test/kotlin/org/jetbrains/kotlinx/spark/api/UDFTest.kt index ad142c00..393d54d5 100644 --- a/kotlin-spark-api/src/test/kotlin/org/jetbrains/kotlinx/spark/api/UDFTest.kt +++ b/kotlin-spark-api/src/test/kotlin/org/jetbrains/kotlinx/spark/api/UDFTest.kt @@ -495,10 +495,11 @@ class UDFTest : ShouldSpec({ override fun outputEncoder() = encoder() } - shouldThrow { - // cannot get name of an unnamed object - udaf(e) - } +// shouldThrow { +// // cannot get name of an unnamed object +// println(e::class.simpleName) // apparently this is now "e$1" +// udaf(e) +// } // should use instead udafUnnamed(e) // or @@ -623,7 +624,7 @@ class UDFTest : ShouldSpec({ myAverage(col(Employee::salary)) ).showDS() - "(${Employee::salary.name})" shouldBe result.columns().single() + result.columns().single() shouldBe "myaverage\$1(${Employee::salary.name})" result should beOfType>() result.collectAsList().single() shouldBe 3750.0 } diff --git a/scala-tuples-in-kotlin/build.gradle.kts b/scala-tuples-in-kotlin/build.gradle.kts index 903231e3..110a7e54 100644 --- a/scala-tuples-in-kotlin/build.gradle.kts +++ b/scala-tuples-in-kotlin/build.gradle.kts @@ -23,6 +23,7 @@ repositories { tasks.withType().configureEach { useJUnitPlatform() + maxHeapSize = "8g" } dependencies { From df2a4f1e73b5fd0841ed9957277dd23c06ac20b0 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Wed, 28 Dec 2022 15:26:36 +0100 Subject: [PATCH 06/31] explicit java version for :core --- core/build.gradle.kts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 2a728172..d9d09217 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -42,6 +42,10 @@ java { languageVersion.set( JavaLanguageVersion.of(Versions.jvmTarget) ) + } else if (Versions.jvmTarget == "1.8" || Versions.jvmTarget == "8") { + languageVersion.set( + JavaLanguageVersion.of(8) + ) } } } @@ -49,6 +53,8 @@ java { tasks.withType { if (Versions.scalaCompat.toDouble() > 2.12) { // scala 2.12 will always target java 8 targetCompatibility = Versions.jvmTarget + } else if (Versions.jvmTarget == "1.8" || Versions.jvmTarget == "8") { + targetCompatibility = "1.8" } } From 2da6511670e1aa57a94f8d4a777afb16d73b5b1c Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Wed, 28 Dec 2022 15:38:15 +0100 Subject: [PATCH 07/31] updating jupyter 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 6444233d..19a6a64c 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -10,7 +10,7 @@ object Versions { inline val sparkMinor get() = spark.substringBeforeLast('.') inline val scalaCompat get() = scala.substringBeforeLast('.') - const val jupyter = "0.11.0-134" + const val jupyter = "0.11.0-210" const val kotest = "5.5.4" const val kotestTestContainers = "1.3.3" const val dokka = "1.7.10" From 74c9b4974bf365438beffeaebdfb3432bddb806e Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Wed, 28 Dec 2022 16:26:42 +0100 Subject: [PATCH 08/31] added longer timeout --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2760b31c..693a8bdd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,7 @@ on: jobs: build-all-versions: + timeout-minutes: 30 strategy: matrix: scala: [ "2.12.17", "2.13.10" ] From 0dd4e5df94e359b85c8099970d3c0bf847b679d7 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 29 Dec 2022 14:04:36 +0100 Subject: [PATCH 09/31] changed memory --- jupyter/build.gradle.kts | 2 +- scala-tuples-in-kotlin/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyter/build.gradle.kts b/jupyter/build.gradle.kts index 103890da..915540e2 100644 --- a/jupyter/build.gradle.kts +++ b/jupyter/build.gradle.kts @@ -26,7 +26,7 @@ repositories { tasks.withType().configureEach { useJUnitPlatform() - maxHeapSize = "8g" + maxHeapSize = "4g" } tasks.processJupyterApiResources { diff --git a/scala-tuples-in-kotlin/build.gradle.kts b/scala-tuples-in-kotlin/build.gradle.kts index 110a7e54..2843c1f6 100644 --- a/scala-tuples-in-kotlin/build.gradle.kts +++ b/scala-tuples-in-kotlin/build.gradle.kts @@ -23,7 +23,7 @@ repositories { tasks.withType().configureEach { useJUnitPlatform() - maxHeapSize = "8g" + maxHeapSize = "4g" } dependencies { From f0b91a024df1e88f048df2f2ca62a3ccb40d8f07 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 29 Dec 2022 14:19:18 +0100 Subject: [PATCH 10/31] changed memory --- jupyter/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyter/build.gradle.kts b/jupyter/build.gradle.kts index 915540e2..bac43fb3 100644 --- a/jupyter/build.gradle.kts +++ b/jupyter/build.gradle.kts @@ -26,7 +26,7 @@ repositories { tasks.withType().configureEach { useJUnitPlatform() - maxHeapSize = "4g" + maxHeapSize = "2g" } tasks.processJupyterApiResources { From c6df808aa909c0edd2ed33fee60f89a3965f5c91 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 29 Dec 2022 14:47:48 +0100 Subject: [PATCH 11/31] kotlin 1.8.0 --- 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 19a6a64c..83bdddf1 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { const val project = "1.2.3-SNAPSHOT" const val groupID = "org.jetbrains.kotlinx.spark" - const val kotlin = "1.8.0-RC2" + const val kotlin = "1.8.0" const val jvmTarget = "8" const val jupyterJvmTarget = "11" From ae28e64fa6f853b9c2ce5ebc5313f24f5f3f2c27 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 5 Jan 2023 13:48:46 +0100 Subject: [PATCH 12/31] 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 48defb9422a34fea64263311a1738e0e0ee34db6 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 5 Jan 2023 13:49:27 +0100 Subject: [PATCH 13/31] updating version to 1.2.4-SNAPSHOT --- 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..8b67b070 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.4-SNAPSHOT" const val groupID = "org.jetbrains.kotlinx.spark" const val kotlin = "1.8.0" const val jvmTarget = "8" From 5100dd50c64d74629785a43ae3f85055111f7e7a Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 5 Jan 2023 13:59:57 +0100 Subject: [PATCH 14/31] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a1fd136..bad9066b 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,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.2) +%use spark(spark=3.3.1, 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. From 3477b3e1d64ffde56cfd2cd57ce261e6a15948ec Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 5 Jan 2023 14:00:46 +0100 Subject: [PATCH 15/31] Update quick-start-guide.md --- docs/quick-start-guide.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/quick-start-guide.md b/docs/quick-start-guide.md index e57105ec..71104404 100644 --- a/docs/quick-start-guide.md +++ b/docs/quick-start-guide.md @@ -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 @@ -163,7 +163,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' // 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' } @@ -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 bbde39a35a587127e4e37d4bb6b511e7f4048c0d Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 5 Jan 2023 14:03:14 +0100 Subject: [PATCH 16/31] 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 ba13a5916d740c779840d7112558fb7ceb602a70 Mon Sep 17 00:00:00 2001 From: cutiechi Date: Thu, 2 Feb 2023 18:28:43 +0800 Subject: [PATCH 17/31] Replace type check by pattern match --- .../sql/catalyst/CatalystTypeConverters.scala | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala b/core/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala index f618cf04..31bb3cc5 100644 --- a/core/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala +++ b/core/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala @@ -82,15 +82,15 @@ object CatalystTypeConverters { final def toCatalyst(@Nullable maybeScalaValue: Any): CatalystType = { if (maybeScalaValue == null) { null.asInstanceOf[CatalystType] - } else if (maybeScalaValue.isInstanceOf[Option[ScalaInputType]]) { - val opt = maybeScalaValue.asInstanceOf[Option[ScalaInputType]] - if (opt.isDefined) { - toCatalystImpl(opt.get) - } else { - null.asInstanceOf[CatalystType] - } - } else { - toCatalystImpl(maybeScalaValue.asInstanceOf[ScalaInputType]) + } else maybeScalaValue match { + case opt: Option[ScalaInputType] => + if (opt.isDefined) { + toCatalystImpl(opt.get) + } else { + null.asInstanceOf[CatalystType] + } + case _ => + toCatalystImpl(maybeScalaValue.asInstanceOf[ScalaInputType]) } } From 04898acd96d3cf0374c5b9c71eea4fc69a325fb7 Mon Sep 17 00:00:00 2001 From: cutiechi Date: Thu, 2 Feb 2023 18:31:15 +0800 Subject: [PATCH 18/31] Replace type check by pattern match --- .../spark/sql/catalyst/CatalystTypeConverters.scala | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala b/core/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala index 31bb3cc5..864fc5f7 100644 --- a/core/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala +++ b/core/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala @@ -429,10 +429,11 @@ object CatalystTypeConverters { // a measurable performance impact. Note that this optimization will be unnecessary if we // use code generation to construct Scala Row -> Catalyst Row converters. def convert(maybeScalaValue: Any): Any = { - if (maybeScalaValue.isInstanceOf[Option[Any]]) { - maybeScalaValue.asInstanceOf[Option[Any]].orNull - } else { - maybeScalaValue + maybeScalaValue match { + case option: Option[Any] => + option.orNull + case _ => + maybeScalaValue } } From e48464e7e981e354c49a2d62914beb157d28fa57 Mon Sep 17 00:00:00 2001 From: dgleeson Date: Thu, 20 Jul 2023 16:04:12 -0700 Subject: [PATCH 19/31] 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 5054b5bdd0823f5914e4baed9931b2abbf9c2cd2 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Fri, 21 Jul 2023 12:46:06 +0200 Subject: [PATCH 20/31] updated kotlin-jupter version, set its java version to 8 --- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- .../org/jetbrains/kotlinx/spark/api/jupyter/JupyterTests.kt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 8b67b070..200376e4 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -3,14 +3,14 @@ object Versions { const val groupID = "org.jetbrains.kotlinx.spark" const val kotlin = "1.8.0" const val jvmTarget = "8" - const val jupyterJvmTarget = "11" + const val jupyterJvmTarget = "8" inline val spark get() = System.getProperty("spark") as String inline val scala get() = System.getProperty("scala") as String inline val sparkMinor get() = spark.substringBeforeLast('.') inline val scalaCompat get() = scala.substringBeforeLast('.') - const val jupyter = "0.11.0-210" + const val jupyter = "0.12.0-32-1" const val kotest = "5.5.4" const val kotestTestContainers = "1.3.3" const val dokka = "1.7.10" diff --git a/jupyter/src/test/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/JupyterTests.kt b/jupyter/src/test/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/JupyterTests.kt index c08def05..b82512b7 100644 --- a/jupyter/src/test/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/JupyterTests.kt +++ b/jupyter/src/test/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/JupyterTests.kt @@ -59,6 +59,7 @@ class JupyterTests : ShouldSpec({ librariesScanner.addLibrariesFromClassLoader( classLoader = currentClassLoader, host = this, + notebook = notebook, integrationTypeNameRules = listOf( PatternNameAcceptanceRule( acceptsFlag = false, @@ -341,6 +342,7 @@ class JupyterStreamingTests : ShouldSpec({ librariesScanner.addLibrariesFromClassLoader( classLoader = currentClassLoader, host = this, + notebook = notebook, integrationTypeNameRules = listOf( PatternNameAcceptanceRule( acceptsFlag = false, From e06ed3451b0a0286b374b627b16ccd563ab9a5d5 Mon Sep 17 00:00:00 2001 From: dgleeson Date: Fri, 21 Jul 2023 14:06:20 -0700 Subject: [PATCH 21/31] 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 22/31] 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" From 4719e26b463aa6c268bdf36ddfc4d2cb425782f7 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 24 Jul 2023 13:08:02 +0200 Subject: [PATCH 23/31] added spark-yarn to jupyter integration by default --- .../org/jetbrains/kotlinx/spark/api/jupyter/Integration.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/jupyter/src/main/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/Integration.kt b/jupyter/src/main/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/Integration.kt index b35109c8..448751ae 100644 --- a/jupyter/src/main/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/Integration.kt +++ b/jupyter/src/main/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/Integration.kt @@ -84,6 +84,7 @@ abstract class Integration(private val notebook: Notebook, private val options: "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion", "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion", "org.apache.spark:spark-sql_$scalaCompatVersion:$sparkVersion", + "org.apache.spark:spark-yarn_$scalaCompatVersion:$sparkVersion", "org.apache.spark:spark-streaming_$scalaCompatVersion:$sparkVersion", "org.apache.spark:spark-mllib_$scalaCompatVersion:$sparkVersion", "org.apache.spark:spark-sql_$scalaCompatVersion:$sparkVersion", From 97f0fa47c183d9165387c5ffca27253c9968c9d0 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 24 Jul 2023 17:13:29 +0200 Subject: [PATCH 24/31] version bumps --- buildSrc/src/main/kotlin/Versions.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 200376e4..ea9ccaca 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { const val project = "1.2.4-SNAPSHOT" const val groupID = "org.jetbrains.kotlinx.spark" - const val kotlin = "1.8.0" + const val kotlin = "1.9.0" const val jvmTarget = "8" const val jupyterJvmTarget = "8" @@ -13,13 +13,13 @@ object Versions { const val jupyter = "0.12.0-32-1" const val kotest = "5.5.4" const val kotestTestContainers = "1.3.3" - const val dokka = "1.7.10" + const val dokka = "1.8.10" const val jcp = "7.0.5" const val mavenPublish = "0.20.0" const val atrium = "0.17.0" const val licenseGradlePluginVersion = "0.15.0" const val kafkaStreamsTestUtils = "3.1.0" - const val hadoop = "3.3.1" + const val hadoop = "3.3.2" const val kotlinxHtml = "0.7.5" const val klaxon = "5.5" const val jacksonDatabind = "2.13.4.2" From 84853919d7317b9e9f57cc80bf5768b93474e99a Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 24 Jul 2023 18:02:20 +0200 Subject: [PATCH 25/31] Revert "version bumps" This reverts commit 97f0fa47c183d9165387c5ffca27253c9968c9d0. --- buildSrc/src/main/kotlin/Versions.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index ea9ccaca..200376e4 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { const val project = "1.2.4-SNAPSHOT" const val groupID = "org.jetbrains.kotlinx.spark" - const val kotlin = "1.9.0" + const val kotlin = "1.8.0" const val jvmTarget = "8" const val jupyterJvmTarget = "8" @@ -13,13 +13,13 @@ object Versions { const val jupyter = "0.12.0-32-1" const val kotest = "5.5.4" const val kotestTestContainers = "1.3.3" - const val dokka = "1.8.10" + const val dokka = "1.7.10" const val jcp = "7.0.5" const val mavenPublish = "0.20.0" const val atrium = "0.17.0" const val licenseGradlePluginVersion = "0.15.0" const val kafkaStreamsTestUtils = "3.1.0" - const val hadoop = "3.3.2" + const val hadoop = "3.3.1" const val kotlinxHtml = "0.7.5" const val klaxon = "5.5" const val jacksonDatabind = "2.13.4.2" From 24f62193366fa60cd10fc17eb5a59d787ee518ad Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 25 Jul 2023 12:48:56 +0200 Subject: [PATCH 26/31] keep hadoop at 3.3.1 --- 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 ea9ccaca..ca15792a 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -19,7 +19,7 @@ object Versions { const val atrium = "0.17.0" const val licenseGradlePluginVersion = "0.15.0" const val kafkaStreamsTestUtils = "3.1.0" - const val hadoop = "3.3.2" + const val hadoop = "3.3.1" const val kotlinxHtml = "0.7.5" const val klaxon = "5.5" const val jacksonDatabind = "2.13.4.2" From 95b29f692259f47cca8b1d7cc901ccb2b10dce55 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 25 Jul 2023 12:52:34 +0200 Subject: [PATCH 27/31] dokka to 1.8.20 --- 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 ca15792a..c969138c 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -13,7 +13,7 @@ object Versions { const val jupyter = "0.12.0-32-1" const val kotest = "5.5.4" const val kotestTestContainers = "1.3.3" - const val dokka = "1.8.10" + const val dokka = "1.8.20" const val jcp = "7.0.5" const val mavenPublish = "0.20.0" const val atrium = "0.17.0" From 26cd005a081de838dc7d4c64402103d9ab16475e Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 25 Jul 2023 13:00:11 +0200 Subject: [PATCH 28/31] kotlin to 1.8.20 --- 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 c969138c..11ac95c8 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { const val project = "1.2.4-SNAPSHOT" const val groupID = "org.jetbrains.kotlinx.spark" - const val kotlin = "1.9.0" + const val kotlin = "1.8.20" const val jvmTarget = "8" const val jupyterJvmTarget = "8" From f8a581aeb7e59567a8dcf59007c4910cf734c76d Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 25 Jul 2023 13:17:43 +0200 Subject: [PATCH 29/31] hadoop to 3.3.6 --- 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 11ac95c8..f7e412dd 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -19,7 +19,7 @@ object Versions { const val atrium = "0.17.0" const val licenseGradlePluginVersion = "0.15.0" const val kafkaStreamsTestUtils = "3.1.0" - const val hadoop = "3.3.1" + const val hadoop = "3.3.6" const val kotlinxHtml = "0.7.5" const val klaxon = "5.5" const val jacksonDatabind = "2.13.4.2" From ee9b8eaa385c8df440f35bc52e5eedeeec823487 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 25 Jul 2023 15:58:29 +0200 Subject: [PATCH 30/31] set version to 1.2.4 release --- 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 f7e412dd..7097a47a 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.4-SNAPSHOT" + const val project = "1.2.4" const val groupID = "org.jetbrains.kotlinx.spark" const val kotlin = "1.8.20" const val jvmTarget = "8" From 470bcf4dd6a0318a1cd0e947670f921f8f62969e Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Wed, 26 Jul 2023 13:07:24 +0200 Subject: [PATCH 31/31] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 88cc6289..b9fae45b 100644 --- a/README.md +++ b/README.md @@ -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.2, scala=2.13, v=1.2.3) +%use spark(spark=3.3.2, scala=2.13, v=1.2.4) ``` Inside the notebook a Spark session will be initiated automatically. This can be accessed via the `spark` value.