Skip to content

Commit bf6f3a9

Browse files
committed
updating to kotlin 1.8.0-RC2, fixed OOM error, fixed udf tests
1 parent bf61a61 commit bf6f3a9

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object Versions {
22
const val project = "1.2.3-SNAPSHOT"
33
const val groupID = "org.jetbrains.kotlinx.spark"
4-
const val kotlin = "1.7.20"
4+
const val kotlin = "1.8.0-RC2"
55
const val jvmTarget = "8"
66
const val jupyterJvmTarget = "11"
77

@@ -11,7 +11,7 @@ object Versions {
1111
inline val scalaCompat get() = scala.substringBeforeLast('.')
1212

1313
const val jupyter = "0.11.0-134"
14-
const val kotest = "5.3.2"
14+
const val kotest = "5.5.4"
1515
const val kotestTestContainers = "1.3.3"
1616
const val dokka = "1.7.10"
1717
const val jcp = "7.0.5"

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
kotlin.daemon.jvmargs=-Xmx10G
2-
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=1G -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
1+
kotlin.daemon.jvmargs=-Xmx8g
2+
org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
33
mavenCentralUsername=dummy
44
mavenCentralPassword=dummy
55

jupyter/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ repositories {
2626

2727
tasks.withType<Test>().configureEach {
2828
useJUnitPlatform()
29+
maxHeapSize = "8g"
2930
}
3031

3132
tasks.processJupyterApiResources {

kotlin-spark-api/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ repositories {
2323

2424
tasks.withType<Test>().configureEach {
2525
useJUnitPlatform()
26+
maxHeapSize = "8g"
2627
}
2728

2829
dependencies {

kotlin-spark-api/src/test/kotlin/org/jetbrains/kotlinx/spark/api/UDFTest.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -495,10 +495,11 @@ class UDFTest : ShouldSpec({
495495
override fun outputEncoder() = encoder<Double>()
496496
}
497497

498-
shouldThrow<IllegalStateException> {
499-
// cannot get name of an unnamed object
500-
udaf(e)
501-
}
498+
// shouldThrow<IllegalStateException> {
499+
// // cannot get name of an unnamed object
500+
// println(e::class.simpleName) // apparently this is now "e$1"
501+
// udaf(e)
502+
// }
502503
// should use instead
503504
udafUnnamed(e)
504505
// or
@@ -623,7 +624,7 @@ class UDFTest : ShouldSpec({
623624
myAverage(col(Employee::salary))
624625
).showDS()
625626

626-
"(${Employee::salary.name})" shouldBe result.columns().single()
627+
result.columns().single() shouldBe "myaverage\$1(${Employee::salary.name})"
627628
result should beOfType<Dataset<Double>>()
628629
result.collectAsList().single() shouldBe 3750.0
629630
}

scala-tuples-in-kotlin/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ repositories {
2323

2424
tasks.withType<Test>().configureEach {
2525
useJUnitPlatform()
26+
maxHeapSize = "8g"
2627
}
2728

2829
dependencies {

0 commit comments

Comments
 (0)