From 08a2b47c77c80251b7e18910dfd1661738c8dc18 Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Tue, 1 Dec 2020 17:12:14 +0000 Subject: [PATCH] Incremental KAPT: fix typo and do check processed sources on clean build --- .../gradle/KaptIncrementalWithIsolatingApt.kt | 21 ++++++++++--------- .../base/incremental/incrementalProcessors.kt | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt index b5213788956..4ce515d8f13 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt @@ -227,24 +227,25 @@ class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() { } """.trimIndent() ) + + val allKotlinStubs = setOf( + project.projectDir.resolve("build/tmp/kapt3/stubs/main/foo/A.java").canonicalPath, + project.projectDir.resolve("build/tmp/kapt3/stubs/main/bar/B.java").canonicalPath, + project.projectDir.resolve("build/tmp/kapt3/stubs/main/bar/UseBKt.java").canonicalPath, + project.projectDir.resolve("build/tmp/kapt3/stubs/main/baz/UtilKt.java").canonicalPath, + project.projectDir.resolve("build/tmp/kapt3/stubs/main/error/NonExistentClass.java").canonicalPath + ) + project.build("clean", "build") { assertSuccessful() + assertEquals(allKotlinStubs + fileInWorkingDir("src/main/java/foo/JavaClass.java").canonicalPath, getProcessedSources(output)) } // change type that all generated sources reference classpathTypeSource.writeText(classpathTypeSource.readText().replace("}", "int i = 10;\n}")) project.build("build") { assertSuccessful() - assertEquals( - setOf( - fileInWorkingDir("build/tmp/kapt3/stubs/main/foo/A.java").canonicalPath, - fileInWorkingDir("build/tmp/kapt3/stubs/main/bar/B.java").canonicalPath, - fileInWorkingDir("build/tmp/kapt3/stubs/main/bar/UseBKt.java").canonicalPath, - fileInWorkingDir("build/tmp/kapt3/stubs/main/baz/UtilKt.java").canonicalPath, - fileInWorkingDir("build/tmp/kapt3/stubs/main/error/NonExistentClass.java").canonicalPath - ), - getProcessedSources(output) - ) + assertEquals(allKotlinStubs, getProcessedSources(output)) } } diff --git a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/incremental/incrementalProcessors.kt b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/incremental/incrementalProcessors.kt index 109b9a30e0e..a674abc535c 100644 --- a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/incremental/incrementalProcessors.kt +++ b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/incremental/incrementalProcessors.kt @@ -71,7 +71,7 @@ class IncrementalProcessor(private val processor: Processor, private val kind: D fun isUnableToRunIncrementally() = !kind.canRunIncrementally - /** Mapping fromm generated file to type that were used as originating elements. For aggregating APs types will be [null]. */ + /** Mapping from generated file to type that were used as originating elements. For aggregating APs types will be [null]. */ fun getGeneratedToSources(): Map = dependencyCollector.value.getGeneratedToSources() /** All top-level types that were processed by aggregating APs. */