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

chore(build): misc cleanups to application and dependency updates plugins

Browse source
This commit is contained in:
Harsh Shandilya 2023-04-23 14:55:01 +05:30
parent 9348b7c444
commit 27d5371472
No known key found for this signature in database
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,8 +6,8 @@ import app.passwordstore.gradle.flavors.FlavorDimensions
import app.passwordstore.gradle.flavors.ProductFlavors import app.passwordstore.gradle.flavors.ProductFlavors
import app.passwordstore.gradle.signing.configureBuildSigning import app.passwordstore.gradle.signing.configureBuildSigning
import app.passwordstore.gradle.snapshot.SnapshotExtension import app.passwordstore.gradle.snapshot.SnapshotExtension
import com.android.build.api.dsl.ApplicationExtension
import com.android.build.gradle.AppPlugin import com.android.build.gradle.AppPlugin
import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.apply
@ -21,8 +21,8 @@ class ApplicationPlugin : Plugin<Project> {
override fun apply(project: Project) { override fun apply(project: Project) {
project.pluginManager.apply(AppPlugin::class) project.pluginManager.apply(AppPlugin::class)
AndroidCommon.configure(project) AndroidCommon.configure(project)
project.extensions.configure<BaseAppModuleExtension> {
val minifySwitch = project.providers.environmentVariable("DISABLE_MINIFY") val minifySwitch = project.providers.environmentVariable("DISABLE_MINIFY")
project.extensions.configure<ApplicationExtension> {
dependenciesInfo { dependenciesInfo {
includeInBundle = false includeInBundle = false
includeInApk = false includeInApk = false
@ -69,7 +69,7 @@ class ApplicationPlugin : Plugin<Project> {
} }
private fun Project.isSnapshot(): Boolean { private fun Project.isSnapshot(): Boolean {
with(project.providers) { with(providers) {
val workflow = environmentVariable("GITHUB_WORKFLOW") val workflow = environmentVariable("GITHUB_WORKFLOW")
val snapshot = environmentVariable("SNAPSHOT") val snapshot = environmentVariable("SNAPSHOT")
return workflow.isPresent || snapshot.isPresent return workflow.isPresent || snapshot.isPresent

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

@ -20,7 +20,6 @@ class DependencyUpdatesPlugin : Plugin<Project> {
rejectVersionIf { rejectVersionIf {
when (candidate.group) { when (candidate.group) {
"commons-codec", "commons-codec",
"com.android.tools.build",
"org.eclipse.jgit" -> true "org.eclipse.jgit" -> true
else -> false else -> false
} }