File tree 8 files changed +24
-12
lines changed
src/test/kotlin/org/jetbrains/kotlinx/spark/api
8 files changed +24
-12
lines changed Original file line number Diff line number Diff line change 8
8
9
9
jobs :
10
10
build-all-versions :
11
+ timeout-minutes : 30
11
12
strategy :
12
13
matrix :
13
14
scala : [ "2.12.17", "2.13.10" ]
Original file line number Diff line number Diff line change 1
1
object Versions {
2
2
const val project = " 1.2.3-SNAPSHOT"
3
3
const val groupID = " org.jetbrains.kotlinx.spark"
4
- const val kotlin = " 1.7.20"
5
- const val jvmTarget = " 11"
4
+ const val kotlin = " 1.8.0"
5
+ const val jvmTarget = " 8"
6
+ const val jupyterJvmTarget = " 11"
6
7
7
8
inline val spark get() = System .getProperty(" spark" ) as String
8
9
inline val scala get() = System .getProperty(" scala" ) as String
9
10
inline val sparkMinor get() = spark.substringBeforeLast(' .' )
10
11
inline val scalaCompat get() = scala.substringBeforeLast(' .' )
11
12
12
- const val jupyter = " 0.11.0-134 "
13
- const val kotest = " 5.3.2 "
13
+ const val jupyter = " 0.11.0-210 "
14
+ const val kotest = " 5.5.4 "
14
15
const val kotestTestContainers = " 1.3.3"
15
16
const val dokka = " 1.7.10"
16
17
const val jcp = " 7.0.5"
Original file line number Diff line number Diff line change @@ -42,13 +42,19 @@ java {
42
42
languageVersion.set(
43
43
JavaLanguageVersion .of(Versions .jvmTarget)
44
44
)
45
+ } else if (Versions .jvmTarget == " 1.8" || Versions .jvmTarget == " 8" ) {
46
+ languageVersion.set(
47
+ JavaLanguageVersion .of(8 )
48
+ )
45
49
}
46
50
}
47
51
}
48
52
49
53
tasks.withType<ScalaCompile > {
50
54
if (Versions .scalaCompat.toDouble() > 2.12 ) { // scala 2.12 will always target java 8
51
55
targetCompatibility = Versions .jvmTarget
56
+ } else if (Versions .jvmTarget == " 1.8" || Versions .jvmTarget == " 8" ) {
57
+ targetCompatibility = " 1.8"
52
58
}
53
59
}
54
60
Original file line number Diff line number Diff line change 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
3
3
mavenCentralUsername =dummy
4
4
mavenCentralPassword =dummy
5
5
Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ repositories {
26
26
27
27
tasks.withType<Test >().configureEach {
28
28
useJUnitPlatform()
29
+ maxHeapSize = " 2g"
29
30
}
30
31
31
32
tasks.processJupyterApiResources {
@@ -143,7 +144,7 @@ tasks.compileTestKotlin {
143
144
kotlin {
144
145
jvmToolchain {
145
146
languageVersion.set(
146
- JavaLanguageVersion .of(Versions .jvmTarget )
147
+ JavaLanguageVersion .of(Versions .jupyterJvmTarget )
147
148
)
148
149
}
149
150
}
Original file line number Diff line number Diff line change @@ -23,6 +23,7 @@ repositories {
23
23
24
24
tasks.withType<Test >().configureEach {
25
25
useJUnitPlatform()
26
+ maxHeapSize = " 8g"
26
27
}
27
28
28
29
dependencies {
Original file line number Diff line number Diff line change @@ -495,10 +495,11 @@ class UDFTest : ShouldSpec({
495
495
override fun outputEncoder() = encoder<Double >()
496
496
}
497
497
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
+ // }
502
503
// should use instead
503
504
udafUnnamed(e)
504
505
// or
@@ -623,7 +624,7 @@ class UDFTest : ShouldSpec({
623
624
myAverage(col(Employee ::salary))
624
625
).showDS()
625
626
626
- " (${Employee ::salary.name} )" shouldBe result.columns().single()
627
+ result.columns().single() shouldBe " myaverage \$ 1 (${Employee ::salary.name} )"
627
628
result should beOfType<Dataset <Double >>()
628
629
result.collectAsList().single() shouldBe 3750.0
629
630
}
Original file line number Diff line number Diff line change @@ -23,6 +23,7 @@ repositories {
23
23
24
24
tasks.withType<Test >().configureEach {
25
25
useJUnitPlatform()
26
+ maxHeapSize = " 4g"
26
27
}
27
28
28
29
dependencies {
You can’t perform that action at this time.
0 commit comments