do not enfoce jdk 11

a-sit-plus · Sep 18, 2023 · ee515d7 · ee515d7
1 parent 223c2fd
commit ee515d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/conventions-vclib/build.gradle.kts b/conventions-vclib/build.gradle.kts
@@ -1,13 +1,14 @@
+import java.io.FileInputStream
+import java.util.*
+
 plugins {
     `kotlin-dsl`
     idea
 }
 group = "at.asitplus.gradle"
 
-idea {
-    project {
-        jdkName = "11" //TODO use from ASP conventions plugin?
-    }
+private val versions = Properties().apply {
+    kotlin.runCatching { load(FileInputStream(rootProject.file("gradle-conventions-plugin/src/main/resources/versions.properties"))) }
 }
 
 dependencies {
@@ -19,15 +20,6 @@ repositories {
     mavenCentral()
     gradlePluginPortal()
 }
-kotlin {
-    jvmToolchain {
-        (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11/*TODO share*/))
-    }
-    /*compilerOptions {
-        languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
-    }*/
-}
 
 gradlePlugin {
     plugins.register("vclib-conventions") {

diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin