Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove a modification for the idea 2023.2 version of the platform #7715

Closed
wants to merge 1 commit into from
Closed

Remove a modification for the idea 2023.2 version of the platform #7715

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions flutter-studio/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,12 @@ intellij {

// If 2023.3+ and IDEA (not AS), then "org.jetbrains.android:$androidVersion", otherwise "org.jetbrains.android",
// see https://github.com/flutter/flutter-intellij/issues/7145
if(ide == "android-studio") {
if (ide == "android-studio") {
pluginList.add("org.jetbrains.android")
} else if (ide == "ideaIC") {
pluginList.add("org.jetbrains.android:$androidVersion")
}

if (ideVersion != "2023.2") {
pluginList.add(smaliPlugin)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So is this plugin not needed anymore when running in Android Studio?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 - did we need to just remove the if condition or the whole block?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logic was used when building the Flutter plugin for the 2023.2 IDEA version of the product, at this point however we won't be pushing out a version of the Flutter plugin for 2023.2: https://github.com/flutter/flutter-intellij/blob/07610c1301ce8792975d10274266abc97e4b2699/product-matrix.json

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logic looks like we wanted the smaliPlugin for all versions that were not 2023.2, including newer versions. So does that mean we should be changing this from

if (ideVersion != "2023.2") {
  pluginList.add(smaliPlugin);
}

to

pluginList.add(smaliPlugin);

}
pluginList.add(langPlugin)
plugins.set(pluginList)
if (ide == "android-studio") {
Expand Down