From 3274e3b690e07bae17a6b881afd5c7cf65907e69 Mon Sep 17 00:00:00 2001
From: Mike Penz <opensource@mikepenz.dev>
Date: Sat, 4 Jan 2025 18:10:44 +0100
Subject: [PATCH 1/2] - cleanup obsolete global group/version name setting

---
 build.gradle.kts                     | 5 -----
 plugin-build/plugin/build.gradle.kts | 4 ++--
 settings.gradle.kts                  | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e4d54d3d2..2d1e465f4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,9 +18,4 @@ plugins {
     alias(baseLibs.plugins.mavenPublish) apply false
 
     alias(libs.plugins.navSafeArgs) apply false
-}
-
-allprojects {
-    group = ext.get("GROUP")!!
-    version = ext.get("VERSION_NAME")!!
 }
\ No newline at end of file
diff --git a/plugin-build/plugin/build.gradle.kts b/plugin-build/plugin/build.gradle.kts
index 67c2f1b3c..66cd494cf 100644
--- a/plugin-build/plugin/build.gradle.kts
+++ b/plugin-build/plugin/build.gradle.kts
@@ -19,8 +19,8 @@ gradlePlugin {
 
     plugins {
         create("aboutlibsPlugin") {
-            id = "${project.group}"
-            implementationClass = "${project.group}.AboutLibrariesPlugin"
+            id = "$group"
+            implementationClass = "$group.AboutLibrariesPlugin"
             description = "Resolve all dependencies used in a gradle module, with associated license and further information."
             displayName = "AboutLibraries Library Gradle Plugin"
             tags = listOf("libraries", "licenses", "android")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9102c5706..1df824fe4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -20,7 +20,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("baseLibs") {
-            from("com.mikepenz:version-catalog:0.1.0")
+            from("com.mikepenz:version-catalog:0.1.1")
         }
     }
 }

From 979ff4add3b6eec182af8b3985286f932bae3d56 Mon Sep 17 00:00:00 2001
From: Mike Penz <opensource@mikepenz.dev>
Date: Sat, 4 Jan 2025 20:04:54 +0100
Subject: [PATCH 2/2] - further cleanup of signing logic - fix release signing

---
 app/build.gradle.kts      | 20 ++++++++------------
 gradle/libs.versions.toml |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2f1b950c9..2391a89ac 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 import com.mikepenz.aboutlibraries.plugin.DuplicateRule
 import com.mikepenz.aboutlibraries.plugin.StrictMode
-import org.jetbrains.kotlin.konan.properties.Properties
+import com.mikepenz.gradle.utils.readPropertyOrElse
 
 plugins {
     kotlin("android")
@@ -11,6 +11,7 @@ plugins {
     id("com.mikepenz.aboutlibraries.plugin")
 }
 
+val openSourceSigningFile: String? = readPropertyOrElse("openSource.signing.file")
 if (openSourceSigningFile != null) {
     apply(from = openSourceSigningFile)
 }
@@ -24,11 +25,17 @@ android {
     }
 
     buildTypes {
+        getByName("debug") {
+            signingConfig = signingConfigs.findByName("debug")
+        }
         create("staging") {
             signingConfig = signingConfigs.findByName("release")
             applicationIdSuffix = ".debugStaging"
             matchingFallbacks.add("debug")
         }
+        getByName("release") {
+            signingConfig = signingConfigs.findByName("release")
+        }
     }
 
     productFlavors {
@@ -138,14 +145,3 @@ configurations.configureEach {
     resolutionStrategy.force(libs.fastAdapter.core)
     resolutionStrategy.force(libs.iconics.core)
 }
-
-private val openSourceSigningFile: String?
-    get() {
-        val k = "openSource.signing.file"
-        return Properties().also { prop ->
-            rootProject.file("local.properties").takeIf { it.exists() }?.let {
-                prop.load(it.inputStream())
-            }
-        }.getProperty(k, null) ?: if (project.hasProperty(k)) project.property(k)
-            ?.toString() else null
-    }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e90a0fbe8..e090ef192 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-conventionPlugin = "0.1.0"
+conventionPlugin = "0.1.1"
 # kotlin
 kotlinxSerialization = "1.7.3"
 kotlinxCollections = "0.3.8"