Merge pull request #2820 from mikepenz/feature/improve_signing

Improve release signing logic
mikepenz · Jan 5, 2025 · 63925dc · 63925dc
2 parents 64b549b + b116d47
commit 63925dc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,13 +62,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: Relase Sonatype
         if: startsWith(github.ref, 'refs/tags/')

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,17 +1,10 @@
-import com.mikepenz.gradle.utils.readPropertyOrElse
-
 plugins {
     id("com.mikepenz.convention.android-application")
     id("com.mikepenz.convention.kotlin")
     id("com.mikepenz.aboutlibraries.plugin")
     id("androidx.navigation.safeargs.kotlin")
 }
 
-val openSourceSigningFile: String? = readPropertyOrElse("openSource.signing.file")
-if (openSourceSigningFile != null) {
-    apply(from = openSourceSigningFile)
-}
-
 android {
     namespace = "com.mikepenz.materialdrawer.app"
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-conventionPlugin = "0.1.1"
+conventionPlugin = "0.1.3"
 # androidx
 appcompat = "1.7.0"
 cardview = "1.0.0"