From 14fd686f324e751b95d9978b924723a1861ee90c Mon Sep 17 00:00:00 2001 From: "s.zemlyakov" Date: Mon, 4 Mar 2024 18:19:19 +0300 Subject: [PATCH] fix: build on system with missing Java21 --- gradle/plugins/kmp-conventions/build.gradle.kts | 7 ------- gradle/plugins/linting-conventions/build.gradle.kts | 7 ------- gradle/plugins/publishing-conventions/build.gradle.kts | 7 ------- gradle/plugins/versions-conventions/build.gradle.kts | 7 ------- 4 files changed, 28 deletions(-) diff --git a/gradle/plugins/kmp-conventions/build.gradle.kts b/gradle/plugins/kmp-conventions/build.gradle.kts index 170af466..522c3009 100644 --- a/gradle/plugins/kmp-conventions/build.gradle.kts +++ b/gradle/plugins/kmp-conventions/build.gradle.kts @@ -12,10 +12,3 @@ dependencies { implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) implementation(libs.kotlin.gradle.plugin) } - -kotlin { - jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(libs.versions.java.compiler.version.get().toInt())) - vendor.set(JvmVendorSpec.matching(libs.versions.java.vendor.get())) - } -} diff --git a/gradle/plugins/linting-conventions/build.gradle.kts b/gradle/plugins/linting-conventions/build.gradle.kts index 67e9929f..41cc6fcb 100644 --- a/gradle/plugins/linting-conventions/build.gradle.kts +++ b/gradle/plugins/linting-conventions/build.gradle.kts @@ -10,10 +10,3 @@ dependencies { implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) implementation(libs.kotlinter.gradle.plugin) } - -kotlin { - jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(libs.versions.java.compiler.version.get().toInt())) - vendor.set(JvmVendorSpec.matching(libs.versions.java.vendor.get())) - } -} diff --git a/gradle/plugins/publishing-conventions/build.gradle.kts b/gradle/plugins/publishing-conventions/build.gradle.kts index 354c2764..6a5f2a8c 100644 --- a/gradle/plugins/publishing-conventions/build.gradle.kts +++ b/gradle/plugins/publishing-conventions/build.gradle.kts @@ -14,13 +14,6 @@ dependencies { implementation(libs.dokka.gradle.plugin) } -kotlin { - jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(libs.versions.java.compiler.version.get().toInt())) - vendor.set(JvmVendorSpec.matching(libs.versions.java.vendor.get())) - } -} - gradlePlugin { plugins { create("publishingConventions") { diff --git a/gradle/plugins/versions-conventions/build.gradle.kts b/gradle/plugins/versions-conventions/build.gradle.kts index fa30b61a..a08e6ed4 100644 --- a/gradle/plugins/versions-conventions/build.gradle.kts +++ b/gradle/plugins/versions-conventions/build.gradle.kts @@ -11,10 +11,3 @@ repositories { dependencies { implementation(libs.gradle.versions.plugin) } - -kotlin { - jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(libs.versions.java.compiler.version.get().toInt())) - vendor.set(JvmVendorSpec.matching(libs.versions.java.vendor.get())) - } -}