Skip to content

Commit 5a01794

Browse files
committed
Improve how resource generation task is wired in
1 parent b3350dd commit 5a01794

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

gradle-build-logic/src/main/kotlin/de.jjohannes.gradle-plugin.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ tasks.test {
1717
}
1818

1919
val updateUniqueModulesProperties = tasks.register<UniqueModulesPropertiesUpdate>("updateUniqueModulesProperties") {
20-
uniqueModulesProperties.set(layout.projectDirectory.file(
21-
"src/main/resources/de/jjohannes/gradle/moduledependencies/unique_modules.properties"))
20+
uniqueModulesProperties.set(layout.projectDirectory.dir("src/main/resources"))
2221
}
2322

24-
tasks.processResources {
25-
dependsOn(updateUniqueModulesProperties)
26-
}
23+
sourceSets.main.get().resources.setSrcDirs(listOf(updateUniqueModulesProperties))

gradle-build-logic/src/main/kotlin/de/jjohannes/gradle/moduledependencies/gradlebuild/tasks/UniqueModulesPropertiesUpdate.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ package de.jjohannes.gradle.moduledependencies.gradlebuild.tasks
22

33
import org.gradle.api.DefaultTask
44
import org.gradle.api.artifacts.ExternalModuleDependency
5-
import org.gradle.api.file.RegularFileProperty
5+
import org.gradle.api.file.DirectoryProperty
66
import org.gradle.api.internal.project.ProjectInternal
7-
import org.gradle.api.tasks.OutputFile
7+
import org.gradle.api.tasks.OutputDirectory
88
import org.gradle.api.tasks.TaskAction
99
import java.io.File
1010
import java.util.Properties
1111

1212
abstract class UniqueModulesPropertiesUpdate : DefaultTask() {
1313

14-
@get:OutputFile
15-
abstract val uniqueModulesProperties: RegularFileProperty
14+
@get:OutputDirectory
15+
abstract val uniqueModulesProperties: DirectoryProperty
1616

1717
@TaskAction
1818
fun convert() {
@@ -24,7 +24,7 @@ abstract class UniqueModulesPropertiesUpdate : DefaultTask() {
2424
val name = split[split.size - 3]
2525
"${entry.key}=$group:$name\n"
2626
}.joinToString("")
27-
uniqueModulesProperties.get().asFile.writeText(modulesToCoordinates)
27+
File(uniqueModulesProperties.get().asFile, "de/jjohannes/gradle/moduledependencies/unique_modules.properties").writeText(modulesToCoordinates)
2828
}
2929

3030
private fun getModulesPropertiesFromRepository(): File {

0 commit comments

Comments
 (0)