Flatten multi-module structure #1980
Merged
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
MarcinAman
approved these changes
Jun 23, 2021
|
|
||
| packages.sorted().joinTo(this, separator = "\n", postfix = "\n") | ||
| modules.map { (module, packages) -> | ||
| "$MODULE_DELIMITER$module\n".takeIf { module.isNotBlank() }.orEmpty() + packages.filter(String::isNotBlank).sorted().joinToString(separator = "\n") |
There was a problem hiding this comment.
Is this a problem that we could have just the module name (without packages) or just packages (without module)
There was a problem hiding this comment.
Packages without module can't happen, empty modules fixed
| .associate { (key, value) -> key to value } | ||
|
|
||
| private fun splitPackages(packages: List<String>): Map<Module, Set<String>> { | ||
| var lastModule: Module = "" |
There was a problem hiding this comment.
you can move it into fold's accumulator so it is fully functional
No that important tho
| locations = packageList.locations.entries.associate { it.key to "$moduleFilename${it.value}" } | ||
| )?.let { fragments.add(it) } ?: fallbackToCopy(input, output) | ||
| } | ||
| return canProcess(input, moduleContext) |
There was a problem hiding this comment.
a this point you know the result without calling this twice
| val linkFormat = fragments.first().linkFormat | ||
|
|
||
| if (!fragments.all { it.linkFormat == linkFormat }) { | ||
| context.logger.error("Link format is inconsistent between modules") |
There was a problem hiding this comment.
pls add more info to message. I think it is ok to just add whole entries there
kamildoleglo
force-pushed
the
flatten-multimodule
branch
from
2ae1b9a
to
53a6327
Compare
kamildoleglo
force-pushed
the
flatten-multimodule
branch
from
8e4e226
to
73ab67a
Compare
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.
No description provided.