Skip multi-release source sets in idea project import by default #107123
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
|
Pinging @elastic/es-delivery (Team:Delivery) |
mark-vieira
commented
Apr 4, 2024
| @@ -130,7 +130,8 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') { | |||
| ':server:generateModulesList', | |||
| ':server:generatePluginsList', | |||
| ':generateProviderImpls', | |||
| ':libs:elasticsearch-native:elasticsearch-native-libraries:extractLibs'].collect { elasticsearchProject.right()?.task(it) ?: it }) | |||
| ':libs:elasticsearch-native:elasticsearch-native-libraries:extractLibs', | |||
| ':x-pack:libs:es-opensaml-security-api:shadowJar'].collect { elasticsearchProject.right()?.task(it) ?: it }) | |||
There was a problem hiding this comment.
Just a random bug I happened to catch while testing this. This artifact is required to properly compile the project.
mark-vieira
commented
Apr 4, 2024
| @@ -239,20 +240,22 @@ if (providers.systemProperty('idea.active').getOrNull() == 'true') { | |||
| * but before the XML document, e.g. a doctype or comment | |||
| */ | |||
| void modifyXml(Object path, Action<? super Node> action, String preface = null) { | |||
| Node xml = parseXml(path) | |||
| action.execute(xml) | |||
| if (project.file(path).exists()) { | |||
There was a problem hiding this comment.
I made this lenient since there seems to be some kind of race condition between when these tasks run and these configuration files exist. There's no good solution for this that I've found but at least doing a refresh or subsequent import will apply the missing config. This is really only applicable to fresh project imports on an empty workspace.
mark-vieira
added
the
auto-merge-without-approval
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.
There is an existing IntelliJ bug that prevents doing a full project build when source sets for multi-release jars are present. This changes the project import behavior so that these source sets are ignored by default and can be explicitly enabled by adding
org.gradle.mrjar.idea.enabled=trueto your~/.gradle/gradle.propertiesfile should you need to actively work on that code.