From 69b4b80dffc6b8ee0d924fa92146d7463dabdfd9 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Wed, 23 Mar 2022 19:02:41 +0100
Subject: [PATCH] Revert "Add KotlinCompile.androidLayoutResources input"

This reverts commit 6ee503f2b2ef2a2d90db5e028a88cb95f19cc55f.
---
 .../internal/kapt/KaptGenerateStubsTask.kt      |  3 ---
 .../android/internal/AndroidSubplugin.kt        |  2 +-
 .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt  | 17 -----------------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt
index 361e7aad6bb..549b9cf6594 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt
@@ -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,
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt
index 109987d92e2..993191dcefe 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt
@@ -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))
             }
         }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 6e747c82dcc..f1d964d2132 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -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)