aboutsummaryrefslogtreecommitdiff
path: root/build-logic/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'build-logic/src/main')
-rw-r--r--build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt8
-rw-r--r--build-logic/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt1
2 files changed, 4 insertions, 5 deletions
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt
index fc980750..c4620e6b 100644
--- a/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt
+++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt
@@ -6,8 +6,8 @@ import app.passwordstore.gradle.flavors.FlavorDimensions
import app.passwordstore.gradle.flavors.ProductFlavors
import app.passwordstore.gradle.signing.configureBuildSigning
import app.passwordstore.gradle.snapshot.SnapshotExtension
+import com.android.build.api.dsl.ApplicationExtension
import com.android.build.gradle.AppPlugin
-import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
@@ -21,8 +21,8 @@ class ApplicationPlugin : Plugin<Project> {
override fun apply(project: Project) {
project.pluginManager.apply(AppPlugin::class)
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 {
includeInBundle = false
includeInApk = false
@@ -69,7 +69,7 @@ class ApplicationPlugin : Plugin<Project> {
}
private fun Project.isSnapshot(): Boolean {
- with(project.providers) {
+ with(providers) {
val workflow = environmentVariable("GITHUB_WORKFLOW")
val snapshot = environmentVariable("SNAPSHOT")
return workflow.isPresent || snapshot.isPresent
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt
index 86742c24..50810938 100644
--- a/build-logic/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt
+++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt
@@ -20,7 +20,6 @@ class DependencyUpdatesPlugin : Plugin<Project> {
rejectVersionIf {
when (candidate.group) {
"commons-codec",
- "com.android.tools.build",
"org.eclipse.jgit" -> true
else -> false
}