- additional build cleanup

- fix sample app release signing
mikepenz · Jan 4, 2025 · a4a8591 · a4a8591
1 parent fb8e585
commit a4a8591
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.konan.properties.Properties
+import com.mikepenz.gradle.utils.readPropertyOrElse
 
 plugins {
     id("com.mikepenz.convention.android-application")
@@ -7,6 +7,7 @@ plugins {
     id("androidx.navigation.safeargs.kotlin")
 }
 
+val openSourceSigningFile: String? = readPropertyOrElse("openSource.signing.file")
 if (openSourceSigningFile != null) {
     apply(from = openSourceSigningFile)
 }
@@ -93,15 +94,4 @@ dependencies {
 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/build.gradle.kts b/build.gradle.kts
@@ -10,9 +10,4 @@ plugins {
     alias(baseLibs.plugins.mavenPublish) apply false
 
     alias(libs.plugins.navSafeArgs) apply false
-}
-
-allprojects {
-    group = ext.get("GROUP")!!
-    version = ext.get("VERSION_NAME")!!
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-conventionPlugin = "0.1.0"
+conventionPlugin = "0.1.1"
 # androidx
 appcompat = "1.7.0"
 cardview = "1.0.0"