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

refactor(build): remove kotlin-library plugin from Android modules

Browse source
This commit is contained in:
Harsh Shandilya 2023-04-27 00:40:40 +05:30
parent 7b5ded4064
commit bf6fe08472
No known key found for this signature in database
8 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autofill-parser/build.gradle.kts
View file

@ -5,7 +5,6 @@
plugins {
id("com.github.android-password-store.published-android-library")
id("com.github.android-password-store.kotlin-android")
id("com.github.android-password-store.kotlin-library")
id("com.github.android-password-store.psl-plugin")
}

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

@ -24,6 +24,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
class KotlinCommonPlugin : Plugin<Project> {
override fun apply(project: Project) {
val isAppModule = project.pluginManager.hasPlugin("com.android.application")
project.pluginManager.apply(DetektPlugin::class.java)
project.extensions.configure<DetektExtension> {
parallel = true
@ -44,12 +45,15 @@ class KotlinCommonPlugin : Plugin<Project> {
sourceCompatibility = JavaVersion.VERSION_11.toString()
targetCompatibility = JavaVersion.VERSION_11.toString()
}
withType<KotlinCompile>().configureEach {
withType<KotlinCompile>().configureEach task@{
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
allWarningsAsErrors.set(true)
languageVersion.set(KotlinVersion.KOTLIN_1_5)
freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS)
if (!this@task.name.contains("test", ignoreCase = true) && !isAppModule) {
freeCompilerArgs.add("-Xexplicit-api=strict")
}
}
}
withType<Test>().configureEach {

9
build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinLibraryPlugin.kt
View file

@ -8,20 +8,11 @@ package app.passwordstore.gradle
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@Suppress("Unused")
class KotlinLibraryPlugin : Plugin<Project> {
override fun apply(project: Project) {
project.pluginManager.apply(KotlinCommonPlugin::class)
project.tasks.withType<KotlinCompile>().configureEach task@{
compilerOptions {
if (!this@task.name.contains("test", ignoreCase = true)) {
freeCompilerArgs.add("-Xexplicit-api=strict")
}
}
}
}
}

5
build-logic/src/main/kotlin/app/passwordstore/gradle/LibraryPlugin.kt
View file

@ -9,7 +9,10 @@ import org.gradle.kotlin.dsl.apply
class LibraryPlugin : Plugin<Project> {
override fun apply(project: Project) {
project.pluginManager.apply(LibraryPlugin::class)
project.pluginManager.run {
apply(LibraryPlugin::class)
apply(KotlinCommonPlugin::class)
}
AndroidCommon.configure(project)
}
}

1
openpgp-ktx/build.gradle.kts
View file

@ -5,7 +5,6 @@
plugins {
id("com.github.android-password-store.published-android-library")
id("com.github.android-password-store.kotlin-android")
id("com.github.android-password-store.kotlin-library")
}
android {

1
passgen/diceware/build.gradle.kts
View file

@ -5,7 +5,6 @@
plugins {
id("com.github.android-password-store.android-library")
id("com.github.android-password-store.kotlin-android")
id("com.github.android-password-store.kotlin-library")
}
android {

1
ssh/build.gradle.kts
View file

@ -7,7 +7,6 @@
plugins {
id("com.github.android-password-store.android-library")
id("com.github.android-password-store.kotlin-android")
id("com.github.android-password-store.kotlin-library")
}
android {

1
ui-compose/build.gradle.kts
View file

@ -5,7 +5,6 @@
plugins {
id("com.github.android-password-store.android-library")
id("com.github.android-password-store.kotlin-android")
id("com.github.android-password-store.kotlin-library")
}
android {