diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2023-07-01 02:59:54 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2023-07-01 02:59:54 +0530 |
| commit | 03aaeab73772a8659df971ff60c10a99b97d52b6 (patch) | |
| tree | 8d0d47c2da214d7603bd584519543f08e91e9f7f /build-logic | |
| parent | 0ba9744f625ca1044c52f8700b8344fc1efaed5b (diff) | |
fix(build): remove JVM vendor preference
Diffstat (limited to 'build-logic')
| -rw-r--r-- | build-logic/build.gradle.kts | 5 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt | 6 |
2 files changed, 2 insertions, 9 deletions
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<JavaToolchainSpec> { - languageVersion.set(JavaLanguageVersion.of(17)) - vendor.set(JvmVendorSpec.ADOPTIUM) -} +private val jvmToolchainAction = Action<JavaToolchainSpec> { 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<Project> { ) val JVM_TOOLCHAIN_ACTION = - Action<JavaToolchainSpec> { - languageVersion.set(JavaLanguageVersion.of(17)) - vendor.set(JvmVendorSpec.ADOPTIUM) - } + Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) } } } |