diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2023-07-01 03:50:24 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2023-07-01 03:50:24 +0530 |
| commit | cc5ea6a4568346061452cff2bbf26242ed315f72 (patch) | |
| tree | ca171cd90862800c252b1b673fc2861d43cbbd63 | |
| parent | 03aaeab73772a8659df971ff60c10a99b97d52b6 (diff) | |
fix(build): remove useless Java configuration for Gradle Toolchains
| -rw-r--r-- | build-logic/build.gradle.kts | 1 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 362672da..20d2ff4a 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -7,7 +7,6 @@ plugins { `kotlin-dsl` } private val jvmToolchainAction = Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) } -java.toolchain(jvmToolchainAction) kotlin.jvmToolchain(jvmToolchainAction) gradlePlugin { diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt index 553e8acd..46a5eb30 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt @@ -8,7 +8,6 @@ package app.passwordstore.gradle import app.passwordstore.gradle.KotlinCommonPlugin.Companion.JVM_TOOLCHAIN_ACTION import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.api.plugins.JavaPluginExtension import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.getByType import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension @@ -22,7 +21,6 @@ class KotlinAndroidPlugin : Plugin<Project> { apply(KotlinAndroidPluginWrapper::class) apply(KotlinCommonPlugin::class) } - project.extensions.getByType<JavaPluginExtension>().toolchain(JVM_TOOLCHAIN_ACTION) project.extensions.getByType<KotlinProjectExtension>().jvmToolchain(JVM_TOOLCHAIN_ACTION) } } |