From 4a209cdac2c2f275d86dcfe1f592759ee8f18c39 Mon Sep 17 00:00:00 2001 From: David Hiendl Date: Fri, 29 Aug 2025 12:18:38 +0200 Subject: [PATCH] convert BuildscriptKotlinDefaults to no actually use any buildscript features due to access to ext vars being problematic --- gradle/BuildscriptKotlinDefaults.gradle | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gradle/BuildscriptKotlinDefaults.gradle b/gradle/BuildscriptKotlinDefaults.gradle index f95cf07..30f3fbb 100644 --- a/gradle/BuildscriptKotlinDefaults.gradle +++ b/gradle/BuildscriptKotlinDefaults.gradle @@ -21,12 +21,10 @@ buildscript { */ // configure defaults for gradle version -/* wrapper { gradleVersion = "$gradlewVersion" distributionType = Wrapper.DistributionType.ALL } -*/ // append jdk version to gradle properties for use by CI environments task writeCIGradleAndJdkVersionInfo(type: WriteProperties, group: "build setup") { @@ -48,7 +46,7 @@ task writeCIGradleAndJdkVersionInfo(type: WriteProperties, group: "build setup") } // always run after wrapper task -// wrapper.finalizedBy writeCIGradleAndJdkVersionInfo +wrapper.finalizedBy writeCIGradleAndJdkVersionInfo // use more compact source set directories without nesting for simple or mono-language projects ext.useCompactKotlinSourceSets = { org.gradle.api.Project target -> @@ -63,7 +61,7 @@ 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 -> target.idea { module { @@ -92,4 +90,3 @@ ext.configureDefaultsIdeaKotlinJava = { org.gradle.api.Project target -> withSourcesJar() } } -*/ \ No newline at end of file