Fix Gradle null-handling in version code/name and signingConfigs DSL

Author: lekhanpro

web/android/app/build.gradle

@@ -20,15 +20,20 @@ def releaseKeyAlias = keystoreProperties['keyAlias'] ?: System.getenv('SPENDWISE
 def releaseKeyPassword = keystoreProperties['keyPassword'] ?: System.getenv('SPENDWISE_KEY_PASSWORD')
 def hasReleaseSigning = releaseStoreFile && releaseStorePassword && releaseKeyAlias && releaseKeyPassword
 
+def envVersionCode = System.getenv('SPENDWISE_VERSION_CODE')
+def appVersionCode = (envVersionCode != null && !envVersionCode.isEmpty()) ? envVersionCode.toInteger() : 1
+def envVersionName = System.getenv('SPENDWISE_VERSION_NAME')
+def appVersionName = (envVersionName != null && !envVersionName.isEmpty()) ? envVersionName : '1.0.0'
+
 android {
     namespace = "com.spendwise.app"
     compileSdk = rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "com.spendwise.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode (System.getenv('SPENDWISE_VERSION_CODE') ?: '1') as Integer
-        versionName System.getenv('SPENDWISE_VERSION_NAME') ?: '1.0.0'
+        versionCode appVersionCode
+        versionName appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -37,8 +42,8 @@ android {
         }
     }
     signingConfigs {
-        if (hasReleaseSigning) {
-            release {
+        release {
+            if (hasReleaseSigning) {
                 storeFile file(releaseStoreFile)
                 storePassword releaseStorePassword
                 keyAlias releaseKeyAlias