fix(build): Fix IDE flavor resolution for 2025.3 unified distribution #6185
+15
−7
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
Zee2413
force-pushed
the
build/253-fixes
branch
from
ca578f0 to
a944dc7
Compare
Starting with 2025.3, IntelliJ IDEA uses a unified distribution. This complements feadd1b which handles the root project, but subplugin dependencies also need the IC→IU mapping to resolve Platform LSP modules correctly.
The toolkit-intellij-plugin.gradle.kts was using .set() which cannot be overridden by .convention(). Changed to use .convention() so that toolkit-publish-root-conventions can properly override with the runIdeVariant property. Also changed toolkit-publish-root-conventions to use .set() so it actually overrides the convention. This fixes the issue where 'Run AWS Toolkit - Ultimate [2025.3]' was still using ideaIC instead of ideaIU, causing Platform LSP modules to be unavailable. This is a bug fix for feadd1b.
Zee2413
force-pushed
the
build/253-fixes
branch
from
a944dc7 to
5fa576b
Compare
manodnyab
reviewed
Jan 16, 2026
| val type = toolkitIntelliJ.ideFlavor.map { IntelliJPlatformType.fromCode(it.toString()) } | ||
| val type = toolkitIntelliJ.ideFlavor.map { flavor -> | ||
| // Starting with 2025.3, IntelliJ IDEA is unified (no separate Community edition) | ||
| if (version.get().startsWith("2025.3") && flavor == IdeFlavor.IC) { |
Contributor
There was a problem hiding this comment.
This is jb gateway so we shouldnt be checking for these
Author
There was a problem hiding this comment.
Isn't gateway below in the else condition?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Types of changes
Description
Starting with 2025.3, JetBrains unified the IntelliJ IDEA distribution - there is no longer a separate Community edition download. The
ideaIC-2025.3artifact doesn't exist; onlyideaIU-2025.3is available.This PR fixes two related issues:
1. Subplugin dependency resolution fails for 2025.3
Problem:
toolkit-intellij-subplugin.gradle.ktswas trying to resolveideaIC-2025.3which doesn't exist.Fix: Added IC→IU mapping when version starts with
2025.3and flavor isIC, so dependencies resolve againstideaIU-2025.3instead.2.
runIdeVariantproperty doesn't override default IDE flavorProblem: Running with
-PrunIdeVariant=IUstill launchedideaICinstead ofideaIU. This is due to Gradle property precedence -.set()creates an immutable value that.convention()cannot override.Fix:
toolkit-intellij-plugin.gradle.ktsto use.convention()(sets overridable default)toolkit-publish-root-conventions.gradle.ktsto use.set()(actually overrides)This complements the existing 2025.3 handling in
feadd1bfcwhich addressed the root project but not subplugin dependencies or runtime IDE selection.Impact
Without these fixes:
-PrunIdeVariant=IUincorrectly launch IC instead of IUChecklist
Note: No tests added as these are build system configuration changes. No changelog entry needed as this is not customer-facing.
License
I confirm that my contribution is made under the terms of the Apache 2.0 license.