codeconsole commented on PR #3128: URL: https://github.com/apache/groovy/pull/3128#issuecomment-6717051096
@daniellansun I can't re-run jobs on apache/groovy, so I merged current master (492ae79db4) to get a fresh run, which also brings in the Windows Gradle cache fix (#3110). `VirtualAnnotationTest` passes locally on the merge. On #3121: both PRs add `onMethodSelection(Expression, MethodNode)` to `TraitTypeCheckingExtension`. Git merges the two cleanly into a class with two such methods, which does not compile. Whichever lands second keeps one method, with this PR's `MethodCallExpression` branch followed by #3121's `PropertyExpression` branch. `VirtualAnnotationTest` also conflicts, as two test blocks added at the same place; the fix there is to keep both. On a local merge of the two that way, with #3121's latest commit, `traitx.*` and `groovy.transform.stc.*` pass. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
