ASSERT-KTH / spork

AST-based structured merge tool for Java, fully Git compatible https://doi.org/10.1109/TSE.2022.3143766
MIT License
51 stars 8 forks source link

[misc] Update dependencies and formatting #459

Closed slarse closed 1 year ago

slarse commented 1 year ago

Updates a bunch of dependencies and the autoformatting (which was seemingly broken).

slarse commented 1 year ago

Thanks @monperrus for giving the CI some love, this PR should fix the rest :)

codecov-commenter commented 1 year ago

Codecov Report

Patch coverage: 91.66% and project coverage change: +0.33% :tada:

Comparison is base (0b9e858) 82.31% compared to head (f260167) 82.64%.

Additional details and impacted files ```diff @@ Coverage Diff @@ ## master #459 +/- ## ============================================ + Coverage 82.31% 82.64% +0.33% + Complexity 363 362 -1 ============================================ Files 43 43 Lines 1730 1769 +39 Branches 303 303 ============================================ + Hits 1424 1462 +38 Misses 180 180 - Partials 126 127 +1 ``` | [Files Changed](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH) | Coverage Δ | | |---|---|---| | [...ava/se/kth/spork/spoon/printer/OperatorHelper.java](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH#diff-c3JjL21haW4vamF2YS9zZS9rdGgvc3Bvcmsvc3Bvb24vcHJpbnRlci9PcGVyYXRvckhlbHBlci5qYXZh) | `20.51% <ø> (ø)` | | | [...n/se/kth/spork/spoon/conflict/IsImplicitHandler.kt](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH#diff-c3JjL21haW4va290bGluL3NlL2t0aC9zcG9yay9zcG9vbi9jb25mbGljdC9Jc0ltcGxpY2l0SGFuZGxlci5rdA==) | `66.66% <ø> (ø)` | | | [...tlin/se/kth/spork/spoon/conflict/IsUpperHandler.kt](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH#diff-c3JjL21haW4va290bGluL3NlL2t0aC9zcG9yay9zcG9vbi9jb25mbGljdC9Jc1VwcGVySGFuZGxlci5rdA==) | `53.33% <ø> (ø)` | | | [...rk/spoon/conflict/MethodOrderingConflictHandler.kt](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH#diff-c3JjL21haW4va290bGluL3NlL2t0aC9zcG9yay9zcG9vbi9jb25mbGljdC9NZXRob2RPcmRlcmluZ0NvbmZsaWN0SGFuZGxlci5rdA==) | `38.46% <ø> (ø)` | | | [.../se/kth/spork/spoon/conflict/StructuralConflict.kt](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH#diff-c3JjL21haW4va290bGluL3NlL2t0aC9zcG9yay9zcG9vbi9jb25mbGljdC9TdHJ1Y3R1cmFsQ29uZmxpY3Qua3Q=) | `83.78% <ø> (ø)` | | | [...e/kth/spork/spoon/matching/ClassRepresentatives.kt](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH#diff-c3JjL21haW4va290bGluL3NlL2t0aC9zcG9yay9zcG9vbi9tYXRjaGluZy9DbGFzc1JlcHJlc2VudGF0aXZlcy5rdA==) | `100.00% <ø> (ø)` | | | [.../kth/spork/spoon/conflict/CommentContentHandler.kt](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH#diff-c3JjL21haW4va290bGluL3NlL2t0aC9zcG9yay9zcG9vbi9jb25mbGljdC9Db21tZW50Q29udGVudEhhbmRsZXIua3Q=) | `57.14% <33.33%> (+7.14%)` | :arrow_up: | | [...rk/spoon/conflict/OptimisticInsertInsertHandler.kt](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH#diff-c3JjL21haW4va290bGluL3NlL2t0aC9zcG9yay9zcG9vbi9jb25mbGljdC9PcHRpbWlzdGljSW5zZXJ0SW5zZXJ0SGFuZGxlci5rdA==) | `50.00% <40.00%> (+25.00%)` | :arrow_up: | | [...kth/spork/spoon/pcsinterpreter/SporkTreeBuilder.kt](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH#diff-c3JjL21haW4va290bGluL3NlL2t0aC9zcG9yay9zcG9vbi9wY3NpbnRlcnByZXRlci9TcG9ya1RyZWVCdWlsZGVyLmt0) | `84.61% <90.47%> (+1.15%)` | :arrow_up: | | [src/main/kotlin/se/kth/spork/base3dm/TdmMerge.kt](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH#diff-c3JjL21haW4va290bGluL3NlL2t0aC9zcG9yay9iYXNlM2RtL1RkbU1lcmdlLmt0) | `92.30% <100.00%> (ø)` | | | ... and [12 more](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH) | | ... and [1 file with indirect coverage changes](https://app.codecov.io/gh/ASSERT-KTH/spork/pull/459/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ASSERT-KTH)

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

monperrus commented 1 year ago

Never enough :heart: for code to stay afloat in the dependency rapids.

monperrus commented 1 year ago

Bumping gt-spoon is breaking https://github.com/ASSERT-KTH/spork/pull/458

To be expected because of the underlying udate to Gumtree v3.

It would be great to port it, and Jean-Remy had ideas about the usage of GT3 in Spork.

slarse commented 1 year ago

I'll try to find some time to give it a try, but my guess is that there's some amount of work involved in doing it. Spork makes use of a whole lot of implementation details, both explicitly and implicitly :)

monperrus commented 1 year ago

agree, that may be quite hard work.