Revert "Add KotlinCompile.androidLayoutResources input"

This reverts commit 6ee503f2b2.
This commit is contained in:
Yahor Berdnikau
2022-03-23 19:02:41 +01:00
parent 46d3f96f0b
commit 69b4b80dff
3 changed files with 1 additions and 21 deletions
@@ -125,9 +125,6 @@ abstract class KaptGenerateStubsTask @Inject constructor(
@get:Internal
override val scriptSources: FileCollection = objectFactory.fileCollection()
@get:Internal
override val androidLayoutResources: FileCollection = objectFactory.fileCollection()
override val incrementalProps: List<FileCollection>
get() = listOf(
sources,
@@ -130,7 +130,7 @@ class AndroidSubplugin : KotlinCompilerPluginSupportPlugin {
)
)
kotlinCompilation.compileKotlinTaskProvider.configure {
it.androidLayoutResourceFiles.from(getLayoutDirectories(project, sourceSet.res.srcDirs))
it.setSource(getLayoutDirectories(project, sourceSet.res.srcDirs))
}
}
@@ -743,7 +743,6 @@ abstract class KotlinCompile @Inject constructor(
sources,
javaSources,
scriptSources,
androidLayoutResources,
commonSourceSet,
classpathSnapshotProperties.classpath,
classpathSnapshotProperties.classpathSnapshot
@@ -988,22 +987,6 @@ abstract class KotlinCompile @Inject constructor(
.matching(::javaFilesPatternFilter)
)
@get:Internal
internal val androidLayoutResourceFiles = objectFactory.fileCollection()
/**
* This input is used by android-extensions plugin
*/
@get:Incremental
@get:InputFiles
@get:IgnoreEmptyDirectories
@get:PathSensitive(PathSensitivity.RELATIVE)
internal open val androidLayoutResources: FileCollection = androidLayoutResourceFiles
.asFileTree
.matching { patternFilterable ->
patternFilterable.include("xml".fileExtensionCasePermutations().map { "**/*.$it" })
}
// override setSource to track Java and script sources as well
override fun setSource(source: Any) {
javaSourceFiles.from(source)