diff options
Diffstat (limited to 'build-logic/android-plugins')
3 files changed, 3 insertions, 10 deletions
diff --git a/build-logic/android-plugins/build.gradle.kts b/build-logic/android-plugins/build.gradle.kts index 8c4315dd..cdc7c315 100644 --- a/build-logic/android-plugins/build.gradle.kts +++ b/build-logic/android-plugins/build.gradle.kts @@ -8,10 +8,7 @@ import org.gradle.api.tasks.compile.JavaCompile import org.gradle.kotlin.dsl.withType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -plugins { - `kotlin-dsl` - `kotlin-dsl-precompiled-script-plugins` -} +plugins { `kotlin-dsl` } afterEvaluate { tasks.withType<JavaCompile>().configureEach { diff --git a/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-application.gradle.kts b/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-application.gradle.kts index e223b721..955ddaaa 100644 --- a/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-application.gradle.kts +++ b/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-application.gradle.kts @@ -3,10 +3,8 @@ * SPDX-License-Identifier: GPL-3.0-only */ -import com.android.build.gradle.internal.dsl.BaseAppModuleExtension import flavors.FlavorDimensions import flavors.ProductFlavors -import org.gradle.kotlin.dsl.configure import signing.configureBuildSigning plugins { @@ -22,7 +20,7 @@ fun Project.isSnapshot(): Boolean { } } -extensions.configure<BaseAppModuleExtension> { +android { val minifySwitch = project.providers.environmentVariable("DISABLE_MINIFY").forUseAtConfigurationTime() diff --git a/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.published-android-library.gradle.kts b/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.published-android-library.gradle.kts index 85ebdbe3..3aa55b7a 100644 --- a/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.published-android-library.gradle.kts +++ b/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.published-android-library.gradle.kts @@ -3,9 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.provideDelegate -import org.gradle.plugins.signing.SigningExtension plugins { id("com.github.android-password-store.android-library") @@ -14,7 +12,7 @@ plugins { } afterEvaluate { - extensions.configure<SigningExtension> { + signing { val signingKey: String? by project val signingPassword: String? by project useInMemoryPgpKeys(signingKey, signingPassword) |