Simplify protoc plugin location #559
Merged
Conversation
This file contains hidden or 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
# Conflicts: # license-report.md # pom.xml # version.gradle.kts
# Conflicts: # license-report.md
Codecov Report
@@ Coverage Diff @@
## master #559 +/- ##
============================================
+ Coverage 73.86% 73.96% +0.10%
Complexity 2968 2968
============================================
Files 507 506 -1
Lines 12009 11990 -19
Branches 672 671 -1
============================================
- Hits 8871 8869 -2
+ Misses 2911 2893 -18
- Partials 227 228 +1 |
|
@armiol, PTAL. |
armiol
approved these changes
Aug 26, 2020
| @@ -103,32 +99,13 @@ private void configureProtocTasks(GenerateProtoTaskCollection tasks) { | |||
| * | |||
| * @param plugins | |||
| * container of all plugins | |||
| * @param project | |||
There was a problem hiding this comment.
Please have a description. In particular, in the context of the current issue, it may be either a root project or a project of a child Gradle module.
Merged
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.
Previously, Model Compiler downloaded the executable Jar with the
protocplugin into the.spinedirectory. This solution is bad for several reasons. The primary one — as it has been discovered, it does not work with included builds.In this PR we simplify the process of locating the Jar. Just like before, there are two scripts (for Windows and for *nix), which launch the Jar (via the
javaCLI tool). Unlike before, those scripts are not Maven artifacts but resources of the Model Compiler. Also, the script resources contain a placeholder for the path to the Jar.To launch the plugin, Model Compiler resolves a dependency on the executable Jar and writes the appropriate script file into a temporary dir with the path to the resolved Jar. Then, Model Compiler configures the Protobuf Gradle plugin to launch the Spine
protocplugin via the written script file.The benefit of the new solution is that all the FS paths are absolute, i.e. there is no difference in who requests the plugin: a root project, a subproject or an included build.