Skip to content

Commit

Permalink
it's now less aggressive and sets the java toolchain version to 11 fo…
Browse files Browse the repository at this point in the history
…r each project instead of restricting the user to only use jdk 11 for gradle
  • Loading branch information
Jolanrensen committed Jun 14, 2024
1 parent c2f2ec1 commit 1aea0c5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 6 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlinx.dataframe.AnyFrame
import org.jetbrains.kotlinx.dataframe.DataFrame
Expand Down Expand Up @@ -124,6 +125,8 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
}
}

kotlin.jvmToolchain(11)

allprojects {
tasks.withType<KotlinCompile> {
kotlinOptions {
Expand Down Expand Up @@ -160,6 +163,9 @@ allprojects {
} catch (_: UnknownDomainObjectException) {
logger.warn("Could not set kotlinter config on :${this.name}")
}

// set the java toolchain version to 11 for all subprojects for CI stability
extensions.findByType<KotlinJvmProjectExtension>()?.jvmToolchain(11)
}
}

Expand Down
4 changes: 0 additions & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,3 @@ plugins {
}
include("dataframe-excel")
include("core")

if (JavaVersion.current() != JavaVersion.VERSION_11) {
throw GradleException("Building this version of the Kotlin DataFrame project can only be done with Java 11.")
}

0 comments on commit 1aea0c5

Please sign in to comment.