Extension constructor refactor (#354)

Author: gmazzo

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

@@ -33,19 +33,13 @@ public class BuildConfigPlugin : Plugin<Project> {
             "Gradle version must be at least $MIN_GRADLE_VERSION"
         }
 
-        val sourceSets = objects.domainObjectContainer(DefaultBuildConfigSourceSet::class)
-
-        val defaultSS = sourceSets.create(SourceSet.MAIN_SOURCE_SET_NAME)
-
         val extension = extensions.create(
             BuildConfigExtension::class.java,
             "buildConfig",
             DefaultBuildConfigExtension::class.java,
-            sourceSets,
-            defaultSS,
-        ) as BuildConfigExtensionInternal
+        ) as DefaultBuildConfigExtension
 
-        sourceSets.configureEach { configureSourceSet(it, defaultSS) }
+        extension.sourceSets.configureEach { configureSourceSet(it, extension.defaultSourceSet) }
 
         extension.generateAtSync
             .convention(
@@ -56,7 +50,7 @@ public class BuildConfigPlugin : Plugin<Project> {
             .finalizeValueOnRead()
 
         afterEvaluate {
-            sourceSets.toList() // force configuration
+            extension.sourceSets.toList() // force configuration
 
             // generate at sync
             if (extension.generateAtSync.get() && isGradleSync) {

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

@@ -3,7 +3,7 @@ package com.github.gmazzo.buildconfig.internal
 import com.github.gmazzo.buildconfig.BuildConfigExtension
 import org.gradle.api.NamedDomainObjectContainer
 
-internal interface BuildConfigExtensionInternal : BuildConfigExtension {
+internal interface BuildConfigExtensionInternal : BuildConfigExtension, BuildConfigSourceSetInternal {
 
     override val sourceSets: NamedDomainObjectContainer<out BuildConfigSourceSetInternal>
 

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

@@ -1,10 +1,22 @@
 package com.github.gmazzo.buildconfig.internal
 
+import javax.inject.Inject
 import org.gradle.api.NamedDomainObjectContainer
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.tasks.SourceSet
+import org.gradle.kotlin.dsl.domainObjectContainer
 
-internal abstract class DefaultBuildConfigExtension(
+internal abstract class DefaultBuildConfigExtension private constructor(
     override val sourceSets: NamedDomainObjectContainer<BuildConfigSourceSetInternal>,
-    defaultSourceSet: BuildConfigSourceSetInternal
+    val defaultSourceSet: BuildConfigSourceSetInternal = sourceSets.maybeCreate(SourceSet.MAIN_SOURCE_SET_NAME)
 ) : BuildConfigExtensionInternal,
     BuildConfigSourceSetInternal by defaultSourceSet,
-    GroovyNullValueWorkaround()
+    GroovyNullValueWorkaround() {
+
+    @Inject
+    @Suppress("UNCHECKED_CAST")
+    constructor(objects: ObjectFactory): this(
+        objects.domainObjectContainer(DefaultBuildConfigSourceSet::class) as NamedDomainObjectContainer<BuildConfigSourceSetInternal>,
+    )
+
+}