diff --git a/buildSrc/src/main/kotlin/sourceSets.kt b/buildSrc/src/main/kotlin/sourceSets.kt index ec38abfb754..98a2721121a 100644 --- a/buildSrc/src/main/kotlin/sourceSets.kt +++ b/buildSrc/src/main/kotlin/sourceSets.kt @@ -4,6 +4,8 @@ import org.gradle.api.* import org.gradle.api.plugins.JavaPluginConvention import org.gradle.api.tasks.* import org.gradle.kotlin.dsl.* +import org.gradle.language.jvm.tasks.ProcessResources + //import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet inline fun Project.sourceSets(crossinline body: SourceSetsBuilder.() -> Unit) = @@ -25,18 +27,20 @@ fun SourceSet.none() { resources.setSrcDirs(emptyList()) } -fun SourceSet.projectDefault() { - when (name) { - "main" -> { - java.srcDirs("src") - resources.srcDir("resources").apply { include("**") } - resources.srcDir("src").apply { include("META-INF/**", "**/*.properties") } - } - "test" -> { - java.srcDirs("test", "tests") +val SourceSet.projectDefault: Project.() -> Unit + get() = { + when (this@projectDefault.name) { + "main" -> { + java.srcDirs("src") + val processResources = tasks.getByName(processResourcesTaskName) as ProcessResources + processResources.from("resources") { include("**") } + processResources.from("src") { include("META-INF/**", "**/*.properties") } + } + "test" -> { + java.srcDirs("test", "tests") + } } } -} // TODO: adding KotlinSourceSet dep to the plugin breaks the build unexpectedly, resolve and uncomment //val SourceSet.kotlin: SourceDirectorySet diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts index 1c56f2f8f4e..d0a2d7d6500 100644 --- a/compiler/util/build.gradle.kts +++ b/compiler/util/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { sourceSets { "main" { projectDefault() - resources.srcDir(File(rootDir, "resources")).apply { include("**") } + resources.srcDir(File(rootDir, "resources")) } "test" {} } diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index ba81995be0c..1699022b3f8 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { sourceSets { "main" { projectDefault() - resources.srcDir("res").apply { include("**") } + resources.srcDir("res") } "test" { projectDefault() } } diff --git a/idea/idea-gradle/build.gradle.kts.173 b/idea/idea-gradle/build.gradle.kts.173 index a059a6e6de3..3bb1936ac85 100644 --- a/idea/idea-gradle/build.gradle.kts.173 +++ b/idea/idea-gradle/build.gradle.kts.173 @@ -53,7 +53,7 @@ dependencies { sourceSets { "main" { projectDefault() - resources.srcDir("res").apply { include("**") } + resources.srcDir("res") } "test" { projectDefault() } } diff --git a/idea/idea-gradle/build.gradle.kts.as31 b/idea/idea-gradle/build.gradle.kts.as31 index acf0a28b220..ff8b0d6f9b2 100644 --- a/idea/idea-gradle/build.gradle.kts.as31 +++ b/idea/idea-gradle/build.gradle.kts.as31 @@ -54,7 +54,7 @@ dependencies { sourceSets { "main" { projectDefault() - resources.srcDir("res").apply { include("**") } + resources.srcDir("res") } "test" { projectDefault() } } diff --git a/idea/idea-gradle/build.gradle.kts.as32 b/idea/idea-gradle/build.gradle.kts.as32 index acf0a28b220..ff8b0d6f9b2 100644 --- a/idea/idea-gradle/build.gradle.kts.as32 +++ b/idea/idea-gradle/build.gradle.kts.as32 @@ -54,7 +54,7 @@ dependencies { sourceSets { "main" { projectDefault() - resources.srcDir("res").apply { include("**") } + resources.srcDir("res") } "test" { projectDefault() } } diff --git a/idea/idea-gradle/build.gradle.kts.as33 b/idea/idea-gradle/build.gradle.kts.as33 index acf0a28b220..ff8b0d6f9b2 100644 --- a/idea/idea-gradle/build.gradle.kts.as33 +++ b/idea/idea-gradle/build.gradle.kts.as33 @@ -54,7 +54,7 @@ dependencies { sourceSets { "main" { projectDefault() - resources.srcDir("res").apply { include("**") } + resources.srcDir("res") } "test" { projectDefault() } }