kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(build): remove JVM vendor preference

Browse source
This commit is contained in:
Harsh Shandilya 2023-07-01 02:59:54 +05:30
parent 0ba9744f62
commit 03aaeab737
No known key found for this signature in database
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build-logic/build.gradle.kts
View file

@ -5,10 +5,7 @@
plugins { `kotlin-dsl` } plugins { `kotlin-dsl` }
private val jvmToolchainAction = Action<JavaToolchainSpec> { private val jvmToolchainAction = Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) }
languageVersion.set(JavaLanguageVersion.of(17))
vendor.set(JvmVendorSpec.ADOPTIUM)
}
java.toolchain(jvmToolchainAction) java.toolchain(jvmToolchainAction)
kotlin.jvmToolchain(jvmToolchainAction) kotlin.jvmToolchain(jvmToolchainAction)

6
build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
View file

@ -12,7 +12,6 @@ import org.gradle.api.tasks.testing.Test
import org.gradle.api.tasks.testing.logging.TestLogEvent import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.gradle.jvm.toolchain.JavaLanguageVersion import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.jvm.toolchain.JavaToolchainSpec import org.gradle.jvm.toolchain.JavaToolchainSpec
import org.gradle.jvm.toolchain.JvmVendorSpec
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@ -48,9 +47,6 @@ class KotlinCommonPlugin : Plugin<Project> {
) )
val JVM_TOOLCHAIN_ACTION = val JVM_TOOLCHAIN_ACTION =
Action<JavaToolchainSpec> { Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) }
languageVersion.set(JavaLanguageVersion.of(17))
vendor.set(JvmVendorSpec.ADOPTIUM)
}
} }
} }