actions/build-scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BuildscriptKotlinDefaults: ensure configureDefaultsIdeaKotlinJava is applied to target project, workarounds for some edge cases with setting jvm versions

Browse Source
This commit is contained in:
David Hiendl 2025-05-22 14:42:42 +02:00
parent 1f48d41a3d
commit d25a695ea0
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gradle/BuildscriptKotlinDefaults.gradle
View File

@ -10,6 +10,7 @@ buildscript {
repositories {
mavenCentral()
// gradlePluginPortal()
}
dependencies {
@ -29,7 +30,7 @@ task writeCIGradleAndJdkVersionInfo(type: WriteProperties, group: "build setup")
destinationFile = ciPropsFile
def props = new Properties()
if(ciPropsFile.exists()) {
if (ciPropsFile.exists()) {
ciPropsFile.withInputStream { props.load(it) }
}
@ -58,22 +59,28 @@ ext.useCompactKotlinSourceSets = { org.gradle.api.Project target ->
}
// configure defaults for java and jdk versions based on provided variables and enable intellij idea integration
ext.configureDefaultsIdeaKotlinJava = { org.gradle.api.Project target ->
idea {
ext.configureDefaultsIdeaKotlinJava = { org.gradle.api.Project target ->
target.idea {
module {
downloadJavadoc = true
downloadSources = true
}
}
kotlin {
target.kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.valueOf("JVM_${javaVersion}"))
// jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.valueOf("JVM_${javaVersion}"))
// workaround for mismatch classloader issues sometimes happening
var newValue = jvmTarget.get().class.getEnumConstants().find { it.target == "${javaVersion}" }
jvmTarget.set(newValue)
}
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(jdkVersion))
var newVersion = JavaLanguageVersion.of(jdkVersion)
if (newVersion != languageVersion.getOrNull()) {
languageVersion.set(JavaLanguageVersion.of(jdkVersion))
}
}
}
java {
target.java {
sourceCompatibility = JavaVersion.toVersion(javaVersion)
targetCompatibility = JavaVersion.toVersion(javaVersion)
withJavadocJar()