Fix the SourceSet.projectDefault() extension adding sources to resources
The `include` calls were effectively made on the `resources` `SourceDirectorySet`, which meant including '**' from 'src' as well. Since the 'SourceDirectorySet' API is quite limited and does not support specifying includes/excludes separately, configure the `ProcessResources` task instead.
This commit is contained in:
@@ -54,7 +54,7 @@ dependencies {
|
||||
sourceSets {
|
||||
"main" {
|
||||
projectDefault()
|
||||
resources.srcDir("res").apply { include("**") }
|
||||
resources.srcDir("res")
|
||||
}
|
||||
"test" { projectDefault() }
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ dependencies {
|
||||
sourceSets {
|
||||
"main" {
|
||||
projectDefault()
|
||||
resources.srcDir("res").apply { include("**") }
|
||||
resources.srcDir("res")
|
||||
}
|
||||
"test" { projectDefault() }
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ dependencies {
|
||||
sourceSets {
|
||||
"main" {
|
||||
projectDefault()
|
||||
resources.srcDir("res").apply { include("**") }
|
||||
resources.srcDir("res")
|
||||
}
|
||||
"test" { projectDefault() }
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ dependencies {
|
||||
sourceSets {
|
||||
"main" {
|
||||
projectDefault()
|
||||
resources.srcDir("res").apply { include("**") }
|
||||
resources.srcDir("res")
|
||||
}
|
||||
"test" { projectDefault() }
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ dependencies {
|
||||
sourceSets {
|
||||
"main" {
|
||||
projectDefault()
|
||||
resources.srcDir("res").apply { include("**") }
|
||||
resources.srcDir("res")
|
||||
}
|
||||
"test" { projectDefault() }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user