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

fix(build): simplify Kotlin JVM target handling

Browse source
This commit is contained in:
Harsh Shandilya 2023-04-25 00:07:31 +05:30
parent 27d5371472
commit 50c00e53bc
No known key found for this signature in database
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
View file

@ -12,7 +12,6 @@ import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.findByType import org.gradle.kotlin.dsl.findByType
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
@Suppress("UnstableApiUsage")
object AndroidCommon { object AndroidCommon {
fun configure(project: Project) { fun configure(project: Project) {
project.extensions.configure<TestedExtension> { project.extensions.configure<TestedExtension> {

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

@ -16,8 +16,8 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
import org.gradle.language.base.plugins.LifecycleBasePlugin import org.gradle.language.base.plugins.LifecycleBasePlugin
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@Suppress("Unused") @Suppress("Unused")
@ -45,10 +45,8 @@ class KotlinCommonPlugin : Plugin<Project> {
targetCompatibility = JavaVersion.VERSION_11.toString() targetCompatibility = JavaVersion.VERSION_11.toString()
} }
withType<KotlinCompile>().configureEach { withType<KotlinCompile>().configureEach {
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
}
withType<KotlinCompilationTask<*>>().configureEach {
compilerOptions { compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
allWarningsAsErrors.set(true) allWarningsAsErrors.set(true)
languageVersion.set(KotlinVersion.KOTLIN_1_5) languageVersion.set(KotlinVersion.KOTLIN_1_5)
freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS) freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS)