Revert "Add KotlinCompile.androidLayoutResources input"
This reverts commit 6ee503f2b2.
This commit is contained in:
-3
@@ -125,9 +125,6 @@ abstract class KaptGenerateStubsTask @Inject constructor(
|
|||||||
@get:Internal
|
@get:Internal
|
||||||
override val scriptSources: FileCollection = objectFactory.fileCollection()
|
override val scriptSources: FileCollection = objectFactory.fileCollection()
|
||||||
|
|
||||||
@get:Internal
|
|
||||||
override val androidLayoutResources: FileCollection = objectFactory.fileCollection()
|
|
||||||
|
|
||||||
override val incrementalProps: List<FileCollection>
|
override val incrementalProps: List<FileCollection>
|
||||||
get() = listOf(
|
get() = listOf(
|
||||||
sources,
|
sources,
|
||||||
|
|||||||
+1
-1
@@ -130,7 +130,7 @@ class AndroidSubplugin : KotlinCompilerPluginSupportPlugin {
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
kotlinCompilation.compileKotlinTaskProvider.configure {
|
kotlinCompilation.compileKotlinTaskProvider.configure {
|
||||||
it.androidLayoutResourceFiles.from(getLayoutDirectories(project, sourceSet.res.srcDirs))
|
it.setSource(getLayoutDirectories(project, sourceSet.res.srcDirs))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-17
@@ -743,7 +743,6 @@ abstract class KotlinCompile @Inject constructor(
|
|||||||
sources,
|
sources,
|
||||||
javaSources,
|
javaSources,
|
||||||
scriptSources,
|
scriptSources,
|
||||||
androidLayoutResources,
|
|
||||||
commonSourceSet,
|
commonSourceSet,
|
||||||
classpathSnapshotProperties.classpath,
|
classpathSnapshotProperties.classpath,
|
||||||
classpathSnapshotProperties.classpathSnapshot
|
classpathSnapshotProperties.classpathSnapshot
|
||||||
@@ -988,22 +987,6 @@ abstract class KotlinCompile @Inject constructor(
|
|||||||
.matching(::javaFilesPatternFilter)
|
.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 setSource to track Java and script sources as well
|
||||||
override fun setSource(source: Any) {
|
override fun setSource(source: Any) {
|
||||||
javaSourceFiles.from(source)
|
javaSourceFiles.from(source)
|
||||||
|
|||||||
Reference in New Issue
Block a user