Skip to content

Commit 8c79a01

Browse files
authored
Merge pull request #189 from Kotlin/java8
Java 8 support
2 parents 4c35f47 + c6df808 commit 8c79a01

File tree

8 files changed

+24
-12
lines changed

8 files changed

+24
-12
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88

99
jobs:
1010
build-all-versions:
11+
timeout-minutes: 30
1112
strategy:
1213
matrix:
1314
scala: [ "2.12.17", "2.13.10" ]

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
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"
5-
const val jvmTarget = "11"
4+
const val kotlin = "1.8.0"
5+
const val jvmTarget = "8"
6+
const val jupyterJvmTarget = "11"
67

78
inline val spark get() = System.getProperty("spark") as String
89
inline val scala get() = System.getProperty("scala") as String
910
inline val sparkMinor get() = spark.substringBeforeLast('.')
1011
inline val scalaCompat get() = scala.substringBeforeLast('.')
1112

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"
1415
const val kotestTestContainers = "1.3.3"
1516
const val dokka = "1.7.10"
1617
const val jcp = "7.0.5"

core/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,19 @@ java {
4242
languageVersion.set(
4343
JavaLanguageVersion.of(Versions.jvmTarget)
4444
)
45+
} else if (Versions.jvmTarget == "1.8" || Versions.jvmTarget == "8") {
46+
languageVersion.set(
47+
JavaLanguageVersion.of(8)
48+
)
4549
}
4650
}
4751
}
4852

4953
tasks.withType<ScalaCompile> {
5054
if (Versions.scalaCompat.toDouble() > 2.12) { // scala 2.12 will always target java 8
5155
targetCompatibility = Versions.jvmTarget
56+
} else if (Versions.jvmTarget == "1.8" || Versions.jvmTarget == "8") {
57+
targetCompatibility = "1.8"
5258
}
5359
}
5460

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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ repositories {
2626

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

3132
tasks.processJupyterApiResources {
@@ -143,7 +144,7 @@ tasks.compileTestKotlin {
143144
kotlin {
144145
jvmToolchain {
145146
languageVersion.set(
146-
JavaLanguageVersion.of(Versions.jvmTarget)
147+
JavaLanguageVersion.of(Versions.jupyterJvmTarget)
147148
)
148149
}
149150
}

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 = "4g"
2627
}
2728

2829
dependencies {

0 commit comments

Comments
 (0)