[Gradle] Fix usaged of deprecated buildDir in Kapt3KotlinGradleSubplugin.kt

^KT-62527 In Progress

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt

@@ -54,17 +54,32 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To
     }
 
     companion object {
+        // Required for IDEA import
+        @Suppress("unused")
         @JvmStatic
-        fun getKaptGeneratedClassesDir(project: Project, sourceSetName: String) =
+        fun getKaptGeneratedClassesDir(project: Project, sourceSetName: String): File =
-            File(project.buildDir, "tmp/kapt3/classes/$sourceSetName")
+            project.getKaptGeneratedClassesDirectory(sourceSetName).get().asFile
 
+        internal fun Project.getKaptGeneratedClassesDirectory(sourceSetName: String) =
+            layout.buildDirectory.dir("tmp/kapt3/classes/$sourceSetName")
+
+        // Required for IDEA import
+        @Suppress("unused")
         @JvmStatic
-        fun getKaptGeneratedSourcesDir(project: Project, sourceSetName: String) =
+        fun getKaptGeneratedSourcesDir(project: Project, sourceSetName: String): File =
-            File(project.buildDir, "generated/source/kapt/$sourceSetName")
+            project.getKaptGeneratedSourcesDirectory(sourceSetName).get().asFile
 
+        internal fun Project.getKaptGeneratedSourcesDirectory(sourceSetName: String) =
+            layout.buildDirectory.dir("generated/source/kapt/$sourceSetName")
+
+        // Required for IDEA import
+        @Suppress("unused")
         @JvmStatic
         fun getKaptGeneratedKotlinSourcesDir(project: Project, sourceSetName: String) =
-            File(project.buildDir, "generated/source/kaptKotlin/$sourceSetName")
+            project.getKaptGeneratedKotlinSourcesDirectory(sourceSetName).get().asFile
+
+        internal fun Project.getKaptGeneratedKotlinSourcesDirectory(sourceSetName: String) =
+            layout.buildDirectory.dir("generated/source/kaptKotlin/$sourceSetName")
 
         const val KAPT_WORKER_DEPENDENCIES_CONFIGURATION_NAME = "kotlinKaptWorkerDependencies"
 
@@ -224,7 +239,7 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To
 
     private fun Kapt3SubpluginContext.temporaryKaptDirectory(
         name: String
-    ) = project.buildDir.resolve("tmp/kapt3/$name/$sourceSetName")
+    ) = project.layout.buildDirectory.dir("tmp/kapt3/$name/$sourceSetName")
 
     internal inner class Kapt3SubpluginContext(
         val project: Project,
@@ -235,9 +250,9 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To
         val kaptExtension: KaptExtension,
         val kaptClasspathConfigurations: List<Configuration>
     ) {
-        val sourcesOutputDir = getKaptGeneratedSourcesDir(project, sourceSetName)
+        val sourcesOutputDir = project.getKaptGeneratedSourcesDirectory(sourceSetName)
-        val kotlinSourcesOutputDir = getKaptGeneratedKotlinSourcesDir(project, sourceSetName)
+        val kotlinSourcesOutputDir = project.getKaptGeneratedKotlinSourcesDirectory(sourceSetName)
-        val classesOutputDir = getKaptGeneratedClassesDir(project, sourceSetName)
+        val classesOutputDir = project.getKaptGeneratedClassesDirectory(sourceSetName)
         val includeCompileClasspath =
             kaptExtension.includeCompileClasspath
                 ?: project.isIncludeCompileClasspath()
@@ -330,7 +345,7 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To
         val androidSubpluginOptions = androidOptions.toList().map { SubpluginOption(it.first, it.second) }
 
         androidSubpluginOptions + getNonAndroidDslApOptions(
-            kaptExtension, project, listOf(kotlinSourcesOutputDir), androidVariantData, androidExtension
+            kaptExtension, project, listOf(kotlinSourcesOutputDir.get().asFile), androidVariantData, androidExtension
         ).get()
     }
 
@@ -355,7 +370,7 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To
                 val androidVariantData = KaptWithAndroid.androidVariantData(this)
                 if (androidVariantData != null) {
                     KaptWithAndroid.registerGeneratedJavaSourceForAndroid(this, project, androidVariantData, taskProvider)
-                    androidVariantData.addJavaSourceFoldersToModel(sourcesOutputDir)
+                    androidVariantData.addJavaSourceFoldersToModel(sourcesOutputDir.get().asFile)
                 } else {
                     registerGeneratedJavaSource(taskProvider, javaCompile)
                 }
@@ -389,7 +404,7 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To
             }
 
             if (project.isIncrementalKapt()) {
-                task.incAptCache.fileValue(getKaptIncrementalAnnotationProcessingCache()).disallowChanges()
+                task.incAptCache.value(getKaptIncrementalAnnotationProcessingCache()).disallowChanges()
             }
 
             task.kaptClasspath.from(kaptClasspathConfiguration).disallowChanges()

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidProjectHandler.kt

@@ -29,6 +29,7 @@ import org.gradle.api.tasks.compile.JavaCompile
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
 import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin
+import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin.Companion.getKaptGeneratedClassesDirectory
 import org.jetbrains.kotlin.gradle.internal.checkAndroidAnnotationProcessorDependencyUsage
 import org.jetbrains.kotlin.gradle.logging.kotlinDebug
 import org.jetbrains.kotlin.gradle.plugin.android.AndroidGradleWrapper
@@ -255,8 +256,8 @@ internal class AndroidProjectHandler(
                 add(kotlinTask.get().destinationDirectory.get().asFile)
                 if (Kapt3GradleSubplugin.isEnabled(project)) {
                     // Add Kapt3 output as well, since there's no SyncOutputTask with the new API
-                    val kaptClasssesDir = Kapt3GradleSubplugin.getKaptGeneratedClassesDir(project, getVariantName(variantData))
+                    val kaptClassesDir = project.getKaptGeneratedClassesDirectory(getVariantName(variantData))
-                    add(kaptClasssesDir)
+                    add(kaptClassesDir.get().asFile)
                 }
             }
         }).builtBy(kotlinTask)