Skip to content

Fix merging desc.ref files#238

Merged
alexander-yevsyukov merged 3 commits intomasterfrom
fix-desc-ref-merging
Oct 22, 2025
Merged

Fix merging desc.ref files#238
alexander-yevsyukov merged 3 commits intomasterfrom
fix-desc-ref-merging

Conversation

@alexander-yevsyukov
Copy link
Copy Markdown
Collaborator

This PR fixes merging Descriptor Set reference files by calling append instead of mergeServiceFile as new Shadow plugin requires.

Copilot AI review requested due to automatic review settings October 22, 2025 19:14
@alexander-yevsyukov alexander-yevsyukov self-assigned this Oct 22, 2025
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates the Shadow plugin configuration to use the correct method for merging Descriptor Set reference files, incrementing the version from 2.0.0-SNAPSHOT.353 to 2.0.0-SNAPSHOT.354.

  • Changed mergeServiceFiles("desc.ref") to append("desc.ref") to comply with new Shadow plugin requirements
  • Updated project version across all modules and documentation
  • Regenerated dependency report with new timestamps

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.

File Description
buildSrc/src/main/kotlin/fat-jar.gradle.kts Fixed descriptor set reference file merging by switching from mergeServiceFiles to append
version.gradle.kts Incremented snapshot version to 354
pom.xml Updated artifact version to match new snapshot
dependencies.md Regenerated dependency report with updated version numbers and timestamps

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@codecov
Copy link
Copy Markdown

codecov Bot commented Oct 22, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 34.47%. Comparing base (c96a370) to head (fd54023).
⚠️ Report is 4 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff            @@
##             master     #238   +/-   ##
=========================================
  Coverage     34.47%   34.47%           
  Complexity      282      282           
=========================================
  Files           136      136           
  Lines          3231     3231           
  Branches        247      247           
=========================================
  Hits           1114     1114           
  Misses         2040     2040           
  Partials         77       77           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@alexander-yevsyukov alexander-yevsyukov merged commit 0f3f1ec into master Oct 22, 2025
7 checks passed
@alexander-yevsyukov alexander-yevsyukov deleted the fix-desc-ref-merging branch October 22, 2025 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants