Improve the generation of descriptor set files for "simple" Spine libraries #504
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t use McJava (due to dependencies): - use per-maven-artifact strategy for naming the descriptor set file (and stop using the same `known_types_...` everywhere; - generate `desc.ref` file referencing the generated descriptor set file (it has not been doing so far).
|
@alexander-yevsyukov PTAL. |
This was referenced Jan 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
At the moment, not all Spine libraries are able to use Spine McJava plugin — due to the cyclic dependencies otherwise introduced. But simultaneously, libraries like
tool-baseandbase-typesprovide their own Proto language, and hence, must bring respective descriptor set files with them.This issue has been addressed very inconsistently throughout the repositories, leading to mis-interpretation of descriptor set files, or failures to locate them at all.
This changeset improves the descriptor set generation by doing the following.
known_types_{sourceSetName}.desceverywhere, which caused clashes.desc.reffile referencing the generated descriptor set file. So far, it was not done at all, leading to loss of the generated descriptor set files.These changes are inspired by the corresponding code in McJava (see
JavaProtocConfigurationPlugin). However, in this PR, the code is much simpler, and no extra Gradle tasks is created.