Make generated annotation marking idempotent

andimarek · andimarek · commit 7e4209cd9c36 · 2026-05-20T15:04:40.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -607,11 +607,13 @@ tasks.register('markGeneratedEqualsHashCode') {
     def jacocoDir = layout.buildDirectory.dir('classes-jacoco/java/main')
 
     inputs.dir(originalDir)
+    inputs.property("generatedAnnotationTaskVersion", 2)
     outputs.dir(jacocoDir)
 
     doLast {
         def src = originalDir.get().asFile
         def dest = jacocoDir.get().asFile
+        project.delete(dest)
         if (!src.exists()) return
 
         // Copy all class files to a separate directory for JaCoCo
@@ -635,8 +637,10 @@ tasks.register('markGeneratedEqualsHashCode') {
                     if (method.invisibleAnnotations == null) {
                         method.invisibleAnnotations = []
                     }
-                    method.invisibleAnnotations.add(new org.objectweb.asm.tree.AnnotationNode(ANNOTATION))
-                    modified = true
+                    if (!method.invisibleAnnotations.any { it.desc == ANNOTATION }) {
+                        method.invisibleAnnotations.add(new org.objectweb.asm.tree.AnnotationNode(ANNOTATION))
+                        modified = true
+                    }
                 }
             }
 
@@ -799,4 +803,3 @@ tasks.withType(GenerateModuleMetadata) {
 }
 
 
-

Original file line number	Diff line number	Diff line change
`@@ -607,11 +607,13 @@ tasks.register('markGeneratedEqualsHashCode') {`
`607`	`607`	`def jacocoDir = layout.buildDirectory.dir('classes-jacoco/java/main')`
`608`	`608`
`609`	`609`	`inputs.dir(originalDir)`
	`610`	`+ inputs.property("generatedAnnotationTaskVersion", 2)`
`610`	`611`	`outputs.dir(jacocoDir)`
`611`	`612`
`612`	`613`	`doLast {`
`613`	`614`	`def src = originalDir.get().asFile`
`614`	`615`	`def dest = jacocoDir.get().asFile`
	`616`	`+ project.delete(dest)`
`615`	`617`	`if (!src.exists()) return`
`616`	`618`
`617`	`619`	`// Copy all class files to a separate directory for JaCoCo`
`@@ -635,8 +637,10 @@ tasks.register('markGeneratedEqualsHashCode') {`
`635`	`637`	`if (method.invisibleAnnotations == null) {`
`636`	`638`	`method.invisibleAnnotations = []`
`637`	`639`	`}`
`638`		`- method.invisibleAnnotations.add(new org.objectweb.asm.tree.AnnotationNode(ANNOTATION))`
`639`		`- modified = true`
	`640`	`+ if (!method.invisibleAnnotations.any { it.desc == ANNOTATION }) {`
	`641`	`+ method.invisibleAnnotations.add(new org.objectweb.asm.tree.AnnotationNode(ANNOTATION))`
	`642`	`+ modified = true`
	`643`	`+ }`
`640`	`644`	`}`
`641`	`645`	`}`
`642`	`646`
`@@ -799,4 +803,3 @@ tasks.withType(GenerateModuleMetadata) {`
`799`	`803`	`}`
`800`	`804`
`801`	`805`
`802`		`-`