From eb53fdb8b4716a3c5394c00739ca28ee56d203b1 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Sun, 31 Dec 2023 10:49:37 +0530 Subject: [PATCH] build: do not setup signing configs when building with F-Droid --- .../java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt | 3 ++- .../com/itsaky/androidide/plugins/SigningConfigPlugin.kt | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt b/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt index 2595c52f9..3042598e7 100644 --- a/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt +++ b/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt @@ -17,6 +17,7 @@ package com.itsaky.androidide.plugins +import isFDroidBuild import org.gradle.api.GradleException import org.gradle.api.Plugin import org.gradle.api.Project @@ -41,7 +42,7 @@ class AndroidIDEPlugin : Plugin { val isAndroidModule = plugins.hasPlugin("com.android.application") || plugins.hasPlugin("com.android.library") - if (isAndroidModule) { + if (isAndroidModule && !isFDroidBuild) { // setup signing configuration plugins.apply(SigningConfigPlugin::class.java) } diff --git a/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/SigningConfigPlugin.kt b/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/SigningConfigPlugin.kt index e55919e71..1db5b79ca 100644 --- a/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/SigningConfigPlugin.kt +++ b/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/SigningConfigPlugin.kt @@ -23,6 +23,7 @@ import KEY_STORE_PASS import com.android.build.gradle.BaseExtension import com.itsaky.androidide.plugins.util.SigningKeyUtils.downloadSigningKey import com.itsaky.androidide.plugins.util.SigningKeyUtils.getEnvOrProp +import isFDroidBuild import org.gradle.api.Plugin import org.gradle.api.Project import signingKey @@ -37,6 +38,11 @@ class SigningConfigPlugin : Plugin { override fun apply(target: Project) { target.run { + if (isFDroidBuild) { + logger.warn("!!! Do not apply ${javaClass.simpleName} when building or F-Droid.") + return + } + // Download the signing key downloadSigningKey()