From ac796335905f551cc923d0b7ad24d87fe73a0f26 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Fri, 16 Jun 2023 14:55:26 +0200 Subject: [PATCH] [Gradle] Register default kapt classes dir as an output #KT-59256 Fixed --- .../src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt | 1 - .../kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt index 833f367c41a..9acb339f694 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt @@ -1272,7 +1272,6 @@ open class Kapt3IT : Kapt3BaseIT() { @DisplayName("KT-59256: kapt generated files are included into the test runtime classpath") @GradleTest - @Disabled("The fix is not yet provided") fun testKaptGeneratedInTestRuntimeClasspath(gradleVersion: GradleVersion) { project("kapt-in-test-runtime-classpath".withPrefix, gradleVersion) { build("test") { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt index 27edd611b4e..854d03fd760 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt @@ -382,8 +382,7 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To // Workaround for changes in Gradle 7.3 causing eager task realization // For details check `KotlinSourceSetProcessor.prepareKotlinCompileTask()` if (kotlinCompilation is KotlinWithJavaCompilation<*, *>) { - val kotlinSourceDirectorySet = kotlinCompilation.defaultSourceSet.kotlin - kotlinSourceDirectorySet.compiledBy(taskProvider, KaptTask::classesDir) + kotlinCompilation.output.classesDirs.from(classesOutputDir).builtBy(taskProvider) } else { kotlinCompilation.output.classesDirs.from(taskProvider.flatMap { it.classesDir }) }