diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt index 1a30ca84475..07cabc332db 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt @@ -199,19 +199,12 @@ open class A { class IncrementalJavaChangeDefaultIT : IncrementalCompilationJavaChangesBase(usePreciseJavaTracking = null) { @Test override fun testModifySignatureTrackedJavaInLib() { - doTest(trackedJavaClass, changeSignature, - expectedAffectedSources = listOf( - "TrackedJavaClassChild.kt", "useTrackedJavaClass.kt", "useTrackedJavaClassFooMethodUsage.kt", - "useTrackedJavaClassSameModule.kt")) + doTest(trackedJavaClass, changeSignature, expectedAffectedSources = listOf("TrackedJavaClassChild.kt", "useTrackedJavaClass.kt")) } @Test override fun testModifyBodyTrackedJavaInLib() { - doTest(trackedJavaClass, changeBody, - expectedAffectedSources = listOf( - "TrackedJavaClassChild.kt", "useTrackedJavaClass.kt", "useTrackedJavaClassFooMethodUsage.kt", - "useTrackedJavaClassSameModule.kt" - )) + doTest(trackedJavaClass, changeBody, expectedAffectedSources = listOf()) } } @@ -227,6 +220,30 @@ class IncrementalJavaChangePreciseIT : IncrementalCompilationJavaChangesBase(use } } +class IncrementalJavaChangeDisablePreciseIT : IncrementalCompilationJavaChangesBase(usePreciseJavaTracking = false) { + @Test + override fun testModifySignatureTrackedJavaInLib() { + doTest( + trackedJavaClass, changeSignature, + expectedAffectedSources = listOf( + "TrackedJavaClassChild.kt", "useTrackedJavaClass.kt", "useTrackedJavaClassFooMethodUsage.kt", + "useTrackedJavaClassSameModule.kt" + ) + ) + } + + @Test + override fun testModifyBodyTrackedJavaInLib() { + doTest( + trackedJavaClass, changeBody, + expectedAffectedSources = listOf( + "TrackedJavaClassChild.kt", "useTrackedJavaClass.kt", "useTrackedJavaClassFooMethodUsage.kt", + "useTrackedJavaClassSameModule.kt" + ) + ) + } +} + abstract class IncrementalCompilationJavaChangesBase(val usePreciseJavaTracking: Boolean?) : BaseGradleIT() { companion object { protected val GRADLE_VERSION = "2.10" 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 e6c1f6087fd..82e67e7f878 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 @@ -283,7 +283,7 @@ open class KotlinCompile : AbstractKotlinCompile(), Kotl internal var artifactFile: File? = null @get:Input - var usePreciseJavaTracking: Boolean = false + var usePreciseJavaTracking: Boolean = true set(value) { field = value logger.kotlinDebug { "Set $this.usePreciseJavaTracking=$value" }