Merge pull request #191 from Kotlin/main

Release 1.2.3
Kotlin · Jan 5, 2023 · c329acc · c329acc
2 parents fd3299b + 3e36ad4
commit c329acc
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 13 deletions.
diff --git 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" ]

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,16 +1,17 @@
 object Versions {
-    const val project = "1.2.2"
+    const val project = "1.2.3-SNAPSHOT"
     const val groupID = "org.jetbrains.kotlinx.spark"
-    const val kotlin = "1.7.20"
-    const val jvmTarget = "11"
+    const val kotlin = "1.8.0"
+    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 kotest = "5.3.2"
+    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"
     const val jcp = "7.0.5"

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -42,13 +42,19 @@ java {
             languageVersion.set(
                 JavaLanguageVersion.of(Versions.jvmTarget)
             )
+        } else if (Versions.jvmTarget == "1.8" || Versions.jvmTarget == "8") {
+            languageVersion.set(
+                JavaLanguageVersion.of(8)
+            )
         }
     }
 }
 
 tasks.withType<ScalaCompile> {
     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"
     }
 }
 

diff --git 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
@@ -26,6 +26,7 @@ repositories {
 
 tasks.withType<Test>().configureEach {
     useJUnitPlatform()
+    maxHeapSize = "2g"
 }
 
 tasks.processJupyterApiResources {
@@ -143,7 +144,7 @@ tasks.compileTestKotlin {
 kotlin {
     jvmToolchain {
         languageVersion.set(
-            JavaLanguageVersion.of(Versions.jvmTarget)
+            JavaLanguageVersion.of(Versions.jupyterJvmTarget)
         )
     }
 }

diff --git a/kotlin-spark-api/build.gradle.kts b/kotlin-spark-api/build.gradle.kts
@@ -23,6 +23,7 @@ repositories {
 
 tasks.withType<Test>().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
@@ -495,10 +495,11 @@ class UDFTest : ShouldSpec({
                         override fun outputEncoder() = encoder<Double>()
                     }
 
-                    shouldThrow<IllegalStateException> {
-                        // cannot get name of an unnamed object
-                        udaf(e)
-                    }
+//                    shouldThrow<IllegalStateException> {
+//                        // 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<Dataset<Double>>()
                     result.collectAsList().single() shouldBe 3750.0
                 }

diff --git a/scala-tuples-in-kotlin/build.gradle.kts b/scala-tuples-in-kotlin/build.gradle.kts
@@ -23,6 +23,7 @@ repositories {
 
 tasks.withType<Test>().configureEach {
     useJUnitPlatform()
+    maxHeapSize = "4g"
 }
 
 dependencies {