Fixed broken Provider values (#347)

Author: gmazzo

demo-project/kmp/build.gradle.kts

@@ -38,8 +38,14 @@ dependencies {
     commonTestImplementation(libs.kotlin.test)
 }
 
+val lazyProvidedValue = objects.property<String>()
+
+gradle.projectsEvaluated {
+    lazyProvidedValue.set("aLazyProvidedValue")
+}
+
 buildConfig {
-    buildConfigField("COMMON_VALUE",  expect("aCommonValue"))   // a constant for all platforms
+    buildConfigField("COMMON_VALUE", expect("aCommonValue"))   // a constant for all platforms
     buildConfigField("PLATFORM", expect<String>())                          // expect a platform specific value
     buildConfigField("DEBUG", expect(false))                    // expect with a default
     buildConfigField("com.eygraber.uri.Uri", "ENDPOINT",
@@ -67,6 +73,7 @@ buildConfig {
 
     sourceSets.named("test") {
         buildConfigField("TEST_VALUE", "aTestValue")
+        buildConfigField("PROVIDED_VALUE", lazyProvidedValue)
     }
 
     sourceSets.named("jvmMain") {

demo-project/kmp/src/commonTest/kotlin/com/github/gmazzo/buildconfig/demos/kmp/CommonBuildConfigTest.kt

@@ -32,4 +32,10 @@ abstract class CommonBuildConfigTest(
         assertEquals(expectedMobile, Single.IS_MOBILE)
     }
 
+    @Test
+    fun testTestProperties() {
+        assertEquals("aTestValue", TestBuildConfig.TEST_VALUE)
+        assertEquals("aLazyProvidedValue", TestBuildConfig.PROVIDED_VALUE)
+    }
+
 }

plugin/src/main/kotlin/com/github/gmazzo/buildconfig/BuildConfigField.kt

@@ -1,5 +1,6 @@
 package com.github.gmazzo.buildconfig
 
+import com.github.gmazzo.buildconfig.generators.BuildConfigKotlinGenerator
 import com.github.gmazzo.buildconfig.internal.nameOf
 import java.io.Serializable
 import java.lang.reflect.Type
@@ -21,7 +22,6 @@ public interface BuildConfigField : Named, Comparable<BuildConfigField> {
     public val type: Property<BuildConfigType>
 
     @get:Input
-    @get:Optional
     public val value: Property<BuildConfigValue>
 
     @get:Input
@@ -59,6 +59,9 @@ public interface BuildConfigField : Named, Comparable<BuildConfigField> {
     public fun value(literal: Serializable?): BuildConfigField = apply {
         value.value(
             when (literal) {
+                is BuildConfigValue.Expect -> literal.also {
+                    tags.add(BuildConfigKotlinGenerator.TagExpect)
+                }
                 is BuildConfigValue -> literal
                 else -> BuildConfigValue.Literal(literal)
             }

plugin/src/main/kotlin/com/github/gmazzo/buildconfig/internal/bindings/KotlinBinder.kt

@@ -1,7 +1,7 @@
 package com.github.gmazzo.buildconfig.internal.bindings
 
 import com.github.gmazzo.buildconfig.BuildConfigClassSpec
-import com.github.gmazzo.buildconfig.BuildConfigValue
+import com.github.gmazzo.buildconfig.BuildConfigField
 import com.github.gmazzo.buildconfig.generators.BuildConfigKotlinGenerator
 import com.github.gmazzo.buildconfig.internal.BuildConfigExtensionInternal
 import com.github.gmazzo.buildconfig.internal.bindings.JavaBinder.registerExtension
@@ -142,23 +142,16 @@ internal object KotlinBinder {
             fillMissingActuals(specsOfTargets)
         }
 
-        private fun BuildConfigClassSpec.hasExpects() =
-            buildConfigFields.any { it.value.orNull is BuildConfigValue.Expect }
-
-        private fun BuildConfigClassSpec.hasActuals() =
-            buildConfigFields.any { it.tags.get().contains(BuildConfigKotlinGenerator.TagActual) }
-
         private fun lookForExpectFields(spec: BuildConfigClassSpec, dependsOnSpecs: Set<BuildConfigClassSpec>) {
             val expectSpecs = linkedSetOf<BuildConfigClassSpec>()
             for (field in spec.buildConfigFields) {
                 for (dependsOnSpec in dependsOnSpecs) {
                     val dependsOnField = dependsOnSpec.buildConfigFields.findByName(field.name) ?: continue
 
-                    check(dependsOnField.value.orNull is BuildConfigValue.Expect) {
+                    check(dependsOnField.isExpect) {
                         "Field '${dependsOnField.name}' in '$dependsOnSpec' must be `expect`, since it's defined as `actual` in '$spec'"
                     }
 
-                    dependsOnField.tags.add(BuildConfigKotlinGenerator.TagExpect)
                     field.tags.add(BuildConfigKotlinGenerator.TagActual)
                     expectSpecs.add(dependsOnSpec)
 
@@ -170,9 +163,7 @@ internal object KotlinBinder {
             // then, in case we have mixed expect and regular constants in the same spec, we promote them all to this spec
             for (expectSpec in expectSpecs) {
                 for (expectField in expectSpec.buildConfigFields) {
-                    expectField.tags.add(BuildConfigKotlinGenerator.TagExpect)
-
-                    if (expectField.value.orNull.isExpectNoDefault) continue
+                    if (expectField.isExpectNoDefault) continue
                     if (spec.buildConfigFields.names.contains(expectField.name)) continue
 
                     spec.buildConfigField(expectField).tags.add(BuildConfigKotlinGenerator.TagActual)
@@ -187,7 +178,7 @@ internal object KotlinBinder {
                 for (expectSpec in dependsOnSpecs) {
                     for (expectField in expectSpec.buildConfigFields) {
                         if (spec.buildConfigFields.names.contains(expectField.name)) continue
-                        if (expectField.value.orNull.isExpectNoDefault) continue
+                        if (expectField.isExpectNoDefault) continue
 
                         spec.buildConfigField(expectField)
                             .tags.add(BuildConfigKotlinGenerator.TagActual)
@@ -199,8 +190,20 @@ internal object KotlinBinder {
             }
         }
 
-        private val BuildConfigValue?.isExpectNoDefault: Boolean
-            get() = this is BuildConfigValue.Expect && value == null
+        private fun BuildConfigClassSpec.hasExpects() =
+            buildConfigFields.any { it.isExpect }
+
+        private fun BuildConfigClassSpec.hasActuals() =
+            buildConfigFields.any { it.isActual }
+
+        private val BuildConfigField.isExpect: Boolean
+            get() = BuildConfigKotlinGenerator.TagExpect in tags.get()
+
+        private val BuildConfigField.isExpectNoDefault: Boolean
+            get() = isExpect && value.get().value == null
+
+        private val BuildConfigField.isActual: Boolean
+            get() = BuildConfigKotlinGenerator.TagActual in tags.get()
 
     }