Merge pull request #80 from fleetbase/patch/profile-release

remove match-s3 plugin, update build.gradle helper fn

Author: roncodes

.github/workflows/profile-release.yml

@@ -447,6 +447,9 @@ jobs:
                   cd android
                   chmod +x ./gradlew
 
+                  # Sanity check
+                  ./gradlew :app:signingReport --no-daemon
+
                   # Install Fastlane for deployment
                   if [ "${{ needs.detect-release.outputs.deploy }}" == "true" ]; then
                     echo "🚀 Installing Fastlane for deployment"
@@ -679,7 +682,6 @@ jobs:
                   cat > Gemfile <<'EOF'
                   source "https://rubygems.org"
                   gem "fastlane", "~> 2.228"
-                  gem "fastlane-plugin-match_storage_s3"
                   EOF
 
                   # Optional: speed up / be deterministic

android/app/build.gradle

@@ -78,10 +78,18 @@ def enableProguardInReleaseBuilds = false
 def jscFlavor = 'org.webkit:android-jsc:+'
 
 /**
-* Helper function to prefer project property variables or fallback to env variable
+* Helper function to pull from env, -P props, or project.env (dotenv)
 */
-def envOrProp(String key) {
-  return project.hasProperty(key) ? project.property(key) : System.getenv(key)
+def readVar = { String key ->
+    def v = System.getenv(key)
+    if (v == null && project.hasProperty(key)) v = project.property(key)?.toString()
+    if (v == null && project.hasProperty('env')) {
+        def m = project.property('env')
+        if (m instanceof Map || m instanceof Properties) {
+            v = m.get(key)?.toString()
+        }
+    }
+    return v
 }
 
 android {
@@ -104,10 +112,10 @@ android {
     }
     signingConfigs {
         release {
-            def ksFile   = envOrProp('MYAPP_UPLOAD_STORE_FILE')
-            def ksPass   = envOrProp('MYAPP_UPLOAD_STORE_PASSWORD')
-            def keyAlias = envOrProp('MYAPP_UPLOAD_KEY_ALIAS')
-            def keyPass  = envOrProp('MYAPP_UPLOAD_KEY_PASSWORD')
+            def ksFile   = readVar('ANDROID_UPLOAD_STORE_FILE')
+            def ksPass   = readVar('ANDROID_UPLOAD_STORE_PASSWORD')
+            def keyAlias = readVar('ANDROID_UPLOAD_KEY_ALIAS')
+            def keyPass  = readVar('ANDROID_UPLOAD_KEY_PASSWORD')
 
             if (ksFile && ksPass && keyAlias && keyPass) {
                 storeFile file(ksFile)