Fix generateProjectData task not being wired with the Kotlin source…

… set
JavierSegoviaCordoba · Feb 4, 2024 · d671c4c · d671c4c
1 parent f496040
commit d671c4c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@
 
 ### Fixed
 
+- `generateProjectData` task not being wired with the Kotlin source set
+
 ### Updated
 
 ## [0.6.1] - 2024-02-04

diff --git a/...adle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/_internal/kotlinSrcSets.kt b/...adle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/_internal/kotlinSrcSets.kt
@@ -1,5 +1,6 @@
 package com.javiersc.hubdle.project.extensions._internal
 
+import org.gradle.api.NamedDomainObjectSet
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.findByType
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
@@ -17,8 +18,8 @@ internal val Project.kotlinSourceSetCommonMain: KotlinSourceSet?
             it.name == "commonMain"
         }
 
-internal val Project.kotlinSourceSetMainOrCommonMain: KotlinSourceSet?
+internal val Project.kotlinSourceSetMainOrCommonMain: NamedDomainObjectSet<KotlinSourceSet>?
     get() =
-        extensions.findByType<KotlinProjectExtension>()?.sourceSets?.firstOrNull {
-            it.name == "main" || it.name == "commonMain"
+        extensions.findByType<KotlinProjectExtension>()?.sourceSets?.named { name ->
+            name == "main" || name == "commonMain"
         }
diff --git a/...in/kotlin/com/javiersc/hubdle/project/extensions/config/project/HubdleProjectExtension.kt b/...in/kotlin/com/javiersc/hubdle/project/extensions/config/project/HubdleProjectExtension.kt
@@ -37,7 +37,7 @@ constructor(
     }
 
     override fun Project.defaultConfiguration() {
-        configurable(priority = Priority.P1) {
+        configurable(priority = Priority.P4) {
             GenerateProjectDataTask.register(project).configure { task ->
                 task.enabled = isFullEnabled.get()
             }

diff --git a/...n/com/javiersc/hubdle/project/extensions/shared/features/tasks/GenerateProjectDataTask.kt b/...n/com/javiersc/hubdle/project/extensions/shared/features/tasks/GenerateProjectDataTask.kt
@@ -163,16 +163,18 @@ constructor(
 
             generateProjectDataTask.configure {
                 it.source(project.allKotlinSrcDirsWithoutBuild)
-                it.packageName.set(packageName)
-                it.projectDir.set(project.projectDir.absolutePath)
-                it.projectGroup.set(projectGroup)
-                it.projectName.set(projectName)
-                it.projectVersion.set(projectVersion)
-                it.rootDir.set(project.rootDir.absolutePath)
+                it.packageName.convention(packageName)
+                it.projectDir.convention(project.projectDir.absolutePath)
+                it.projectGroup.convention(projectGroup)
+                it.projectName.convention(projectName)
+                it.projectVersion.convention(projectVersion)
+                it.rootDir.convention(project.rootDir.absolutePath)
                 it.outputDir.convention(outputDir)
             }
             prepareKotlinIdeaImport.dependsOn(generateProjectDataTask)
-            project.kotlinSourceSetMainOrCommonMain?.kotlin?.srcDir(generateProjectDataTask)
+            project.kotlinSourceSetMainOrCommonMain?.configureEach { sourceSet ->
+                sourceSet.kotlin.srcDir(generateProjectDataTask)
+            }
             return generateProjectDataTask
         }
     }