Skip to content

Commit 1aea0c5

Browse files
committed
it's now less aggressive and sets the java toolchain version to 11 for each project instead of restricting the user to only use jdk 11 for gradle
1 parent c2f2ec1 commit 1aea0c5

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

build.gradle.kts

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
2+
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
23
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
34
import org.jetbrains.kotlinx.dataframe.AnyFrame
45
import org.jetbrains.kotlinx.dataframe.DataFrame
@@ -124,6 +125,8 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
124125
}
125126
}
126127

128+
kotlin.jvmToolchain(11)
129+
127130
allprojects {
128131
tasks.withType<KotlinCompile> {
129132
kotlinOptions {
@@ -160,6 +163,9 @@ allprojects {
160163
} catch (_: UnknownDomainObjectException) {
161164
logger.warn("Could not set kotlinter config on :${this.name}")
162165
}
166+
167+
// set the java toolchain version to 11 for all subprojects for CI stability
168+
extensions.findByType<KotlinJvmProjectExtension>()?.jvmToolchain(11)
163169
}
164170
}
165171

settings.gradle.kts

-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,3 @@ plugins {
4141
}
4242
include("dataframe-excel")
4343
include("core")
44-
45-
if (JavaVersion.current() != JavaVersion.VERSION_11) {
46-
throw GradleException("Building this version of the Kotlin DataFrame project can only be done with Java 11.")
47-
}

0 commit comments

Comments
 (0)