Make properties null-by-default

app-check/app-check-sdk/build.gradle.kts

@@ -6,21 +6,10 @@ plugins {
 }
 
 buildConfig {
-    val firebaseAndroidAppId by stringPropertyOrNull { value ->
-        buildConfigField<String?>("FIREBASE_ANDROID_APP_ID", value)
-    }
-
-    val gcloudProject by stringPropertyOrNull { value ->
-        buildConfigField<String?>("GCLOUD_PROJECT", value)
-    }
-
-    val gcpProject by stringPropertyOrNull { value ->
-        buildConfigField<String?>("GCP_PROJECT", value)
-    }
-
-    val googleCloudProject by stringPropertyOrNull { value ->
-        buildConfigField<String?>("GOOGLE_CLOUD_PROJECT", value)
-    }
+    val firebaseAndroidAppId by stringProperty(::buildConfigField)
+    val gcloudProject by stringProperty(::buildConfigField)
+    val gcpProject by stringProperty(::buildConfigField)
+    val googleCloudProject by stringProperty(::buildConfigField)
 
     packageName.set("io.ashdavies.check")
 }

app-launcher/android/build.gradle.kts

@@ -23,13 +23,8 @@ android {
 }
 
 buildConfig {
-    val androidApiKey by stringProperty { value ->
-        buildConfigField("ANDROID_API_KEY", value)
-    }
-
-    val androidStrictMode by booleanProperty { value ->
-        buildConfigField("ANDROID_STRICT_MODE", value)
-    }
+    val androidApiKey by stringProperty(::buildConfigField)
+    val androidStrictMode by stringProperty(::buildConfigField)
 
     packageName.set(android.namespace)
 }

app-launcher/desktop/build.gradle.kts

@@ -9,9 +9,7 @@ plugins {
 }
 
 buildConfig {
-    val browserApiKey by stringProperty { value ->
-        buildConfigField("BROWSER_API_KEY", value)
-    }
+    val browserApiKey by stringProperty(::buildConfigField)
 
     packageName.set("io.ashdavies.playground")
 }

cloud-run/build.gradle.kts

@@ -13,17 +13,9 @@ application {
 }
 
 buildConfig {
-    val firebaseAndroidAppId by stringPropertyOrNull { value ->
-        buildConfigField<String?>("FIREBASE_ANDROID_APP_ID", value)
-    }
-
-    val googleServiceAccountId by stringPropertyOrNull { value ->
-        buildConfigField<String?>("GOOGLE_SERVICE_ACCOUNT_ID", value)
-    }
-
-    val integrationApiKey by stringPropertyOrNull { value ->
-        buildConfigField<String?>("INTEGRATION_API_KEY", value)
-    }
+    val firebaseAndroidAppId by stringProperty(::buildConfigField)
+    val googleServiceAccountId by stringProperty(::buildConfigField)
+    val integrationApiKey by stringProperty(::buildConfigField)
 
     packageName.set("io.ashdavies.cloud")
 }

conferences-app/build.gradle.kts

@@ -28,20 +28,20 @@ android {
         enableV3Signing = true
         enableV4Signing = true
 
-        val keyStoreFile by stringPropertyOrNull {
-            if (it != null) storeFile = rootProject.file(it)
+        val keyStoreFile by stringProperty { _, value ->
+            if (value != null) storeFile = rootProject.file(value)
         }
 
-        val keyStorePassword by stringPropertyOrNull {
-            if (it != null) storePassword = it
+        val keyStorePassword by stringProperty { _, value ->
+            if (value != null) storePassword = value
         }
 
-        val releaseKeyAlias by stringPropertyOrNull {
-            if (it != null) keyAlias = it
+        val releaseKeyAlias by stringProperty { _, value ->
+            if (value != null) keyAlias = value
         }
 
-        val releaseKeyPassword by stringPropertyOrNull {
-            if (it != null) keyPassword = it
+        val releaseKeyPassword by stringProperty { _, value ->
+            if (value != null) keyPassword = value
         }
     }
 
@@ -68,8 +68,8 @@ android {
     }
 
     defaultConfig {
-        val versionCode by stringPropertyOrNull {
-            versionCode = it?.toInt() ?: 1
+        val versionCode by stringProperty { _, value ->
+            versionCode = value?.toInt() ?: 1
         }
 
         versionName = "1.0.0"
@@ -96,9 +96,9 @@ android {
 }
 
 buildConfig {
-    val androidApiKey by stringPropertyWithTag(::buildConfigField)
-    val androidStrictMode by booleanPropertyWithTag(::buildConfigField)
-    val browserApiKey by stringPropertyWithTag(::buildConfigField)
+    val androidApiKey by stringProperty(::buildConfigField)
+    val androidStrictMode by booleanProperty(::buildConfigField)
+    val browserApiKey by stringProperty(::buildConfigField)
 
     packageName.set(android.namespace)
 }

fused-properties/src/main/kotlin/StringProperty.kt

@@ -29,37 +29,23 @@ private fun Project.stringPropertyProvider(definition: PropertyDefinition): Prov
         .orElse(providers.environmentVariable(definition.envPropertyName))
 }
 
-public fun Project.booleanProperty(block: (Boolean) -> Unit = { }): ReadOnlyDelegateProvider<Boolean> {
-    return readOnlyDelegateProvider { provider, _ -> provider.get().toBoolean().also(block) }
+public fun Project.booleanProperty(block: (String, Boolean?) -> Unit): ReadOnlyDelegateProvider<Boolean?> {
+    return readOnlyDelegateProvider { provider, tag -> provider.get().toBoolean().also { block(tag, it) } }
 }
 
-public fun Project.booleanPropertyWithTag(action: (String, Boolean) -> Unit): ReadOnlyDelegateProvider<Boolean> {
-    return readOnlyDelegateProvider { provider, tag -> provider.get().toBoolean().also { action(tag, it) } }
-}
-
-public fun Project.stringProperty(block: (String) -> Unit = { }): ReadOnlyDelegateProvider<String> {
-    return readOnlyDelegateProvider { provider, _ -> provider.get().also(block) }
-}
-
-public fun Project.stringPropertyWithTag(action: (String, String) -> Unit): ReadOnlyDelegateProvider<String> {
-    return readOnlyDelegateProvider { provider, tag -> provider.get().also { action(tag, it) } }
-}
-
-public fun Project.stringPropertyOrNull(block: (String?) -> Unit = { }): ReadOnlyDelegateProvider<String?> {
-    return readOnlyDelegateProvider { provider, _ -> provider.orNull.also(block) }
+public fun Project.stringProperty(block: (String, String?) -> Unit): ReadOnlyDelegateProvider<String?> {
+    return readOnlyDelegateProvider { provider, tag -> provider.orNull.also { block(tag, it) } }
 }
 
 private fun <T> Project.readOnlyDelegateProvider(
     transform: (provider: Provider<String>, tag: String) -> T,
 ): ReadOnlyDelegateProvider<T> = ReadOnlyDelegateProvider { _, property ->
     val definition = PropertyDefinition(property.name)
+    val provider = stringPropertyProvider(definition)
 
-    val value = transform(
-        stringPropertyProvider(definition),
-        definition.envPropertyName,
-    )
-
-    ReadOnlyProperty { _, _ -> value }
+    ReadOnlyProperty { _, _ ->
+        transform(provider, definition.envPropertyName)
+    }
 }
 
 private fun <S : Any, T> Provider<S>.mapOrNull(block: (S) -> T?): Provider<T> {

identity-manager/build.gradle.kts

@@ -11,9 +11,7 @@ android {
 }
 
 buildConfig {
-    val serverClientId by stringProperty { value ->
-        buildConfigField("SERVER_CLIENT_ID", value)
-    }
+    val serverClientId by stringProperty(::buildConfigField)
 
     packageName.set(android.namespace)
 }

map-routes/build.gradle.kts

@@ -9,18 +9,16 @@ plugins {
 
 android {
     defaultConfig {
-        val androidApiKey by stringProperty { value ->
-            manifestPlaceholders["ANDROID_API_KEY"] = value
+        val androidApiKey by stringProperty { _, value ->
+            manifestPlaceholders["ANDROID_API_KEY"] = "$value"
         }
     }
 
     namespace = "io.ashdavies.routes"
 }
 
 buildConfig {
-    val androidApiKey by stringProperty { value ->
-        buildConfigField("ANDROID_API_KEY", value)
-    }
+    val androidApiKey by stringProperty(::buildConfigField)
 
     packageName.set(android.namespace)
 }