From 03aaeab73772a8659df971ff60c10a99b97d52b6 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 1 Jul 2023 02:59:54 +0530 Subject: fix(build): remove JVM vendor preference --- build-logic/build.gradle.kts | 5 +---- .../src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'build-logic') diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 21ca91bd..362672da 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -5,10 +5,7 @@ plugins { `kotlin-dsl` } -private val jvmToolchainAction = Action { - languageVersion.set(JavaLanguageVersion.of(17)) - vendor.set(JvmVendorSpec.ADOPTIUM) -} +private val jvmToolchainAction = Action { languageVersion.set(JavaLanguageVersion.of(17)) } java.toolchain(jvmToolchainAction) kotlin.jvmToolchain(jvmToolchainAction) diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt index 587f66d1..5a0b14a8 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt @@ -12,7 +12,6 @@ import org.gradle.api.tasks.testing.Test import org.gradle.api.tasks.testing.logging.TestLogEvent import org.gradle.jvm.toolchain.JavaLanguageVersion import org.gradle.jvm.toolchain.JavaToolchainSpec -import org.gradle.jvm.toolchain.JvmVendorSpec import org.gradle.kotlin.dsl.withType import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -48,9 +47,6 @@ class KotlinCommonPlugin : Plugin { ) val JVM_TOOLCHAIN_ACTION = - Action { - languageVersion.set(JavaLanguageVersion.of(17)) - vendor.set(JvmVendorSpec.ADOPTIUM) - } + Action { languageVersion.set(JavaLanguageVersion.of(17)) } } } -- cgit v1.2.3