Merge pull request #268 from mikepenz/feature/rework_sample_signing

Improve release signing logic
mikepenz · Jan 5, 2025 · 3fa2699 · 3fa2699
2 parents 23d81c2 + 5208498
commit 3fa2699
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -132,13 +132,10 @@ jobs:
         run: |
           echo "${{ secrets.KEYSTORE }}" > opensource.jks.asc
           gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch "opensource.jks.asc" > "app/opensource.jks"
-          echo "${{ secrets.SIGNING_GRADLE }}" > signing.gradle.asc
-          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch "signing.gradle.asc" > "app/signing.gradle"
-          echo "openSource.signing.file=signing.gradle" >> local.properties
 
       - name: Build Release App
         if: startsWith(github.ref, 'refs/tags/')
-        run: ./gradlew app:assembleRelease app:bundleRelease
+        run: ./gradlew app:assembleRelease app:bundleRelease -P"com.mikepenz.android.signing.enabled"="true" -P"com.mikepenz.android.signing.storeFile"="app/opensource.jks" -P"com.mikepenz.android.signing.storePassword"="${{ secrets.STORE_PASSWORD }}" -P"com.mikepenz.android.signing.keyAlias"="${{ secrets.KEY_ALIAS }}" -P"com.mikepenz.android.signing.keyPassword"="${{ secrets.KEY_PASSWORD }}"
 
       - name: Collect artifacts
         if: startsWith(github.ref, 'refs/tags/')

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.konan.properties.Properties
-
 plugins {
     id("com.mikepenz.convention.kotlin")
     id("com.mikepenz.convention.android-application")
@@ -8,10 +6,6 @@ plugins {
     alias(baseLibs.plugins.screenshot)
 }
 
-if (openSourceSigningFile != null) {
-    apply(from = openSourceSigningFile)
-}
-
 android {
     namespace = "com.mikepenz.markdown.app"
 
@@ -44,15 +38,4 @@ dependencies {
 aboutLibraries {
     registerAndroidTasks = false
     duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
-}
-
-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
@@ -1,5 +1,5 @@
 [versions]
-conventionPlugin = "0.1.0"
+conventionPlugin = "0.1.3"
 androidx-activityCompose = "1.9.3"
 androidx-material = "1.12.0"
 coil = "3.0.4"