azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gradle IC: treat companion object change as class signature change

Browse Source
This commit is contained in:
Alexey Tsvetkov
2016-10-27 16:33:20 +03:00
parent f01a956a8b
commit fc1af746c6
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt
+1
View File
@@ -190,6 +190,7 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot
ProtoBufClassKind.COMPANION_OBJECT_NAME -> { ProtoBufClassKind.COMPANION_OBJECT_NAME -> {
if (oldProto.hasCompanionObjectName()) oldProto.companionObjectName.oldToNames() if (oldProto.hasCompanionObjectName()) oldProto.companionObjectName.oldToNames()
if (newProto.hasCompanionObjectName()) newProto.companionObjectName.newToNames() if (newProto.hasCompanionObjectName()) newProto.companionObjectName.newToNames()
isClassAffected = true
} }
ProtoBufClassKind.NESTED_CLASS_NAME_LIST -> { ProtoBufClassKind.NESTED_CLASS_NAME_LIST -> {
if (classIsSealed) { if (classIsSealed) {
jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out
Vendored
+3 -3
View File
@@ -2,11 +2,11 @@ REMOVED: class ClassWithChangedCompanionObject$FirstName.class
REMOVED: class ClassWithRemovedCompanionObject$Companion.class REMOVED: class ClassWithRemovedCompanionObject$Companion.class
ADDED: class ClassWithAddedCompanionObject$Companion.class ADDED: class ClassWithAddedCompanionObject$Companion.class
ADDED: class ClassWithChangedCompanionObject$SecondName.class ADDED: class ClassWithChangedCompanionObject$SecondName.class
changes in test/ClassWithAddedCompanionObject: MEMBERS changes in test/ClassWithAddedCompanionObject: CLASS_SIGNATURE, MEMBERS
[Companion] [Companion]
changes in test/ClassWithChangedCompanionObject: MEMBERS changes in test/ClassWithChangedCompanionObject: CLASS_SIGNATURE, MEMBERS
[FirstName, SecondName] [FirstName, SecondName]
changes in test/ClassWithChangedVisibilityForCompanionObject.Companion: CLASS_SIGNATURE changes in test/ClassWithChangedVisibilityForCompanionObject.Companion: CLASS_SIGNATURE
changes in test/ClassWithChangedVisibilityForCompanionObject: NONE changes in test/ClassWithChangedVisibilityForCompanionObject: NONE
changes in test/ClassWithRemovedCompanionObject: MEMBERS changes in test/ClassWithRemovedCompanionObject: CLASS_SIGNATURE, MEMBERS
[Companion] [Companion]
jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log
Vendored
+1
View File
@@ -10,6 +10,7 @@ End of files
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
src/companionExtension.kt src/companionExtension.kt
src/companionReferenceExplicit.kt src/companionReferenceExplicit.kt
src/companionReferenceImplicit.kt
Exit code: ADDITIONAL_PASS_REQUIRED Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------ ------------------------------------------
Cleaning output files: Cleaning output files:
jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log
Vendored
+5 -1
View File
@@ -8,16 +8,19 @@ Compiling files:
src/A.kt src/A.kt
End of files End of files
Marked as dirty by Kotlin: Marked as dirty by Kotlin:
src/useA.kt
src/useAbar.kt src/useAbar.kt
src/useAfoo.kt src/useAfoo.kt
Exit code: ADDITIONAL_PASS_REQUIRED Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------ ------------------------------------------
Cleaning output files: Cleaning output files:
out/production/module/META-INF/module.kotlin_module out/production/module/META-INF/module.kotlin_module
out/production/module/use/UseAKt.class
out/production/module/use/UseAbarKt.class out/production/module/use/UseAbarKt.class
out/production/module/use/UseAfooKt.class out/production/module/use/UseAfooKt.class
End of files End of files
Compiling files: Compiling files:
src/useA.kt
src/useAbar.kt src/useAbar.kt
src/useAfoo.kt src/useAfoo.kt
End of files End of files
@@ -34,8 +37,9 @@ Cleaning output files:
End of files End of files
Compiling files: Compiling files:
src/A.kt src/A.kt
src/useA.kt
src/useAbar.kt src/useAbar.kt
src/useAfoo.kt src/useAfoo.kt
End of files End of files
Exit code: OK Exit code: OK
------------------------------------------ ------------------------------------------