Composite builds support for nested jars #992
Conversation
There was a problem hiding this comment.
I dont fully understand the problem tbh, this doesnt seem like the correct solution at all to me. A Configuration is a FileCollection so you should be able to do .from() on it getNestedJars().
An intergration test is needed for this as well, it might help me understand what the problem is.
| @Deprecated | ||
| @InputFiles | ||
| public abstract ConfigurableFileCollection getNestedJars(); |
There was a problem hiding this comment.
We cannot deprecate this, as its used for adding files that arent part of a Configuration
There was a problem hiding this comment.
Adding to this collection directly doesn't add any metadata even if the file isn't actually a mod jar. Files can also be added directly to Configurations. So it doesn't really make sense to me to actually keep this.
| @InputFiles | ||
| public FileCollection getNestedDependenciesResolved() { // for task up-to-date checking | ||
| final ConfigurableFileCollection files = getProject().files(); | ||
|
|
||
| if (getAddNestedDependencies().get()) { | ||
| getNestedConfigurations().get().forEach(files::from); | ||
| files.from(getNestedJars()); | ||
| } | ||
|
|
||
| return files; | ||
| } |
There was a problem hiding this comment.
How is this any different from putting the Configuration in the existing ConfigurableFileCollection
There was a problem hiding this comment.
Adding configuration directly to the existing ConfigurableFileCollection causes duplicates. That collection also doesn't take care of metadata.
Based on `simple` test
|
Thanks for adding a test, im still not super happy with this fix, but dont have a better suggestion off the top of my head. Ill have to sit down and take a better look into this. |
|
This is likely superseded by #1080, which is a more idiomatic approach - storing |
Resolves #975
This delays dependency resolution for nested jars until it is actually needed because dependencies substituted from included builds doesn't actually resolve during configuration phase.
This also adds
nestedConfigurationsforRemapJar, allowing custom configurations to be used for inclusion.Note that this still retains the behavior of not adding transitive dependencies as nested jars.