diff --git a/.github/workflows/presubmit.yaml b/.github/workflows/presubmit.yaml
index c2b269754f..88bbce4834 100644
--- a/.github/workflows/presubmit.yaml
+++ b/.github/workflows/presubmit.yaml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [2023.3, 2024.1, 2024.2]
+        version: [2023.3, 2024.1, 2024.2, 2024.3]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
diff --git a/build.gradle.kts b/build.gradle.kts
index d9ba388c4e..e67f0aff38 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,43 +1,14 @@
 /*
- * Copyright 2019 The Chromium Authors. All rights reserved.
+ * Copyright 2024 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-buildscript {
-  repositories {
-    mavenCentral()
-    maven {
-      url=uri("https://www.jetbrains.com/intellij-repository/snapshots/")
-    }
-    maven {
-      url=uri("https://oss.sonatype.org/content/repositories/snapshots/")
-    }
-    maven {
-      url=uri("https://www.jetbrains.com/intellij-repository/releases")
-    }
-    gradlePluginPortal()
-  }
-}
-
-plugins {
-  id("org.jetbrains.intellij") version "1.17.3"
-  id("org.jetbrains.kotlin.jvm") version "2.0.0"
-}
-
-repositories {
-  mavenLocal()
-  mavenCentral()
-  maven {
-    url=uri("https://www.jetbrains.com/intellij-repository/snapshots/")
-  }
-  maven {
-    url=uri("https://oss.sonatype.org/content/repositories/snapshots/")
-  }
-  maven {
-    url=uri("https://www.jetbrains.com/intellij-repository/releases")
-  }
-}
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.models.ProductRelease
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 // Specify UTF-8 for all compilations so we avoid Windows-1252.
 allprojects {
@@ -49,81 +20,158 @@ allprojects {
   }
 }
 
-val ide: String by project
-val flutterPluginVersion: String by project
-val javaVersion: String by project
-val androidVersion: String by project
-val dartVersion: String by project
-val baseVersion: String by project
-val name: String by project
-val buildSpec: String by project
-val smaliPlugin: String by project
-val langPlugin: String by project
-val ideVersion: String by project
+repositories {
+  mavenCentral()
+  intellijPlatform {
+    defaultRepositories()
+  }
+}
+
+plugins {
+  // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html
+  // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
+  id("org.jetbrains.intellij.platform") version "2.1.0"
+  id("org.jetbrains.kotlin.jvm") version "2.0.0"
+}
 
+val flutterPluginVersion = providers.gradleProperty("flutterPluginVersion").get()
+val ideaProduct = providers.gradleProperty("ideaProduct").get()
+val ideaVersion = providers.gradleProperty("ideaVersion").get()
+val dartPluginVersion = providers.gradleProperty("dartPluginVersion").get()
+// The Android Plugin version is only used if the ideaProduct is not "android-studio"
+val androidPluginVersion = providers.gradleProperty("androidPluginVersion").get()
+val sinceBuildInput = providers.gradleProperty("sinceBuild").get()
+val untilBuildInput = providers.gradleProperty("untilBuild").get()
 group = "io.flutter"
-version = flutterPluginVersion
 
+// For debugging purposes:
+println("flutterPluginVersion: $flutterPluginVersion")
+println("ideaProduct: $ideaProduct")
+println("ideaVersion: $ideaVersion")
+println("dartPluginVersion: $dartPluginVersion")
+println("androidPluginVersion: $androidPluginVersion")
+println("sinceBuild: $sinceBuildInput")
+println("untilBuild: $untilBuildInput")
+println("group: $group")
+
+kotlin {
+  compilerOptions {
+    apiVersion.set(KotlinVersion.KOTLIN_1_9)
+    jvmTarget = JvmTarget.JVM_17
+  }
+}
+val javaCompatibilityVersion = JavaVersion.VERSION_17
 java {
-  sourceCompatibility = JavaVersion.toVersion(javaVersion)
-  targetCompatibility = JavaVersion.toVersion(javaVersion)
+  sourceCompatibility = javaCompatibilityVersion
+  targetCompatibility = javaCompatibilityVersion
 }
 
-intellij {
-  pluginName.set(name)
-  // This adds nullability assertions, but also compiles forms.
-  instrumentCode.set(true)
-  updateSinceUntilBuild.set(false)
-  version.set(ideVersion)
-  downloadSources.set(false)
-  val pluginList = mutableListOf(
-    project(":flutter-idea"), "java", "properties",
-    "junit", "Git4Idea", "Kotlin", "gradle",
-    "Groovy", "Dart:$dartVersion")
+dependencies {
+  intellijPlatform {
+    if (ideaProduct == "android-studio") {
+      create(IntelliJPlatformType.AndroidStudio, ideaVersion)
+    } else {//if (ide == "ideaIC") {
+      create(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+    }
+    testFramework(TestFrameworkType.Platform)
+    val bundledPluginList = mutableListOf(
+      "com.intellij.java",
+      "com.intellij.properties",
+      "JUnit",
+      "Git4Idea",
+      "org.jetbrains.kotlin",
+      "org.jetbrains.plugins.gradle",
+      "org.intellij.intelliLang",
+    )
+    if (ideaProduct == "android-studio") {
+      bundledPluginList.add("org.jetbrains.android")
+      bundledPluginList.add("com.android.tools.idea.smali")
+    }
+    val pluginList = mutableListOf("Dart:$dartPluginVersion")
+    if (ideaProduct == "IC") {
+      pluginList.add("org.jetbrains.android:$androidPluginVersion")
+    }
 
-  // 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") {
-    pluginList.add("org.jetbrains.android")
-  } else if (ide == "ideaIC") {
-    pluginList.add("org.jetbrains.android:$androidVersion")
-  }
+    // Finally, add the plugins into their respective lists:
+    // https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html#project-setup
+    bundledPlugins(bundledPluginList)
+    plugins(pluginList)
 
-  if (ide == "android-studio") {
-    pluginList.add(smaliPlugin)
-  }
-  pluginList.add(langPlugin)
-  if (ide == "android-studio") {
-    type.set("AI")
-    pluginList += listOf(project(":flutter-studio"))
+    // The warning that "instrumentationTools()" is deprecated might be valid, however, this error is produced by Gradle IJ plugin version
+    // 2.1.0 if this isn't included:
+    //  Caused by: org.gradle.api.GradleException: No Java Compiler dependency found.
+    //  Please ensure the `instrumentationTools()` entry is present in the project dependencies section along with the `intellijDependencies()` entry in the repositories section.
+    //  See: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
+    instrumentationTools()
+//    pluginVerifier()
   }
-  plugins.set(pluginList)
 }
+//intellijPlatform {
+//  pluginConfiguration {
+//    version = flutterPluginVersion
+//    ideaVersion {
+//      sinceBuild = sinceBuildInput
+//      untilBuild = untilBuildInput
+//    }
+//  }
+//  // TODO (jwren) get the verifier to work, and enable in the github presubmit,
+//  //  the com.teamdev dep is having the verifier fail
+//  // Verifier documentation: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html#intellijPlatform-pluginVerification-ides
+//  pluginVerification {
+//    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#mutePluginVerifierProblems
+//    freeArgs = listOf(
+//      "-mute",
+//      "TemplateWordInPluginId"
+//    )
+//    ides {
+//      if (ideaProduct == "android-studio") {
+//        ide(IntelliJPlatformType.AndroidStudio, ideaVersion)
+//      } else {
+//          ide(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+//        }
+//      recommended()
+////      select {
+////        types = listOf(IntelliJPlatformType.AndroidStudio)
+////        channels = listOf(ProductRelease.Channel.RELEASE)
+////        sinceBuild = sinceBuildInput
+////        untilBuild = untilBuildInput
+////      }
+//    }
+//  }
+//}
 
+// Documentation for printProductsReleases:
+// https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#how-to-check-the-latest-available-eap-release
 tasks {
-  buildSearchableOptions {
-    enabled = false
-  }
-  prepareSandbox {
-    dependsOn(":flutter-idea:prepareSandbox")
-    if (ide == "android-studio") {
-      dependsOn(":flutter-studio:prepareSandbox")
+  printProductsReleases {
+    channels = listOf(ProductRelease.Channel.EAP)
+    types = listOf(IntelliJPlatformType.IntellijIdeaCommunity)
+    untilBuild = provider { null }
+
+    doLast {
+      productsReleases.get().max()
     }
   }
 }
 
 dependencies {
-  implementation(project("flutter-idea", "instrumentedJar")) // Second arg is required to use forms
-  if (ide == "android-studio") {
+  implementation(project("flutter-idea"))
+  if (ideaProduct == "android-studio") {
     implementation(project("flutter-studio"))
   }
 }
 
 tasks {
-  instrumentCode {
-    compilerVersion.set(baseVersion)
+  prepareJarSearchableOptions {
+    enabled = false
+  }
+  buildSearchableOptions {
+    enabled = false
   }
-  instrumentTestCode {
-    compilerVersion.set(baseVersion)
+  prepareSandbox {
+    dependsOn(":flutter-idea:prepareSandbox")
+    if (ideaProduct == "android-studio") {
+      dependsOn(":flutter-studio:prepareSandbox")
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/flutter-idea/build.gradle.kts b/flutter-idea/build.gradle.kts
index 24e4d06e81..0b0608c4e3 100644
--- a/flutter-idea/build.gradle.kts
+++ b/flutter-idea/build.gradle.kts
@@ -1,79 +1,125 @@
 /*
- * Copyright 2020 The Chromium Authors. All rights reserved.
+ * Copyright 2024 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 repositories {
-  mavenLocal()
-  maven {
-    url=uri("https://www.jetbrains.com/intellij-repository/snapshots/")
-  }
-
   mavenCentral()
-  maven {
-    url=uri("https://oss.sonatype.org/content/repositories/snapshots/")
-  }
-  maven {
-    url=uri("https://www.jetbrains.com/intellij-repository/releases")
+  intellijPlatform {
+    defaultRepositories()
   }
 }
 
 plugins {
+  // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html
+  // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
   id("java")
-  id("kotlin")
-  id("org.jetbrains.intellij")
+  id("org.jetbrains.intellij.platform") version "2.1.0"
+  id("org.jetbrains.kotlin.jvm") version "2.0.0"
 }
 
-val ide: String by project
-val flutterPluginVersion: String by project
-val javaVersion: String by project
-val androidVersion: String by project
-val dartVersion: String by project
-val baseVersion: String by project
-val smaliPlugin: String by project
-val langPlugin: String by project
-val ideVersion: String by project
-
+val flutterPluginVersion = providers.gradleProperty("flutterPluginVersion").get()
+val ideaProduct = providers.gradleProperty("ideaProduct").get()
+val ideaVersion = providers.gradleProperty("ideaVersion").get()
+val dartPluginVersion = providers.gradleProperty("dartPluginVersion").get()
+// The Android Plugin version is only used if the ideaProduct is not "android-studio"
+val androidPluginVersion = providers.gradleProperty("androidPluginVersion").get()
+val sinceBuildInput = providers.gradleProperty("sinceBuild").get()
+val untilBuildInput = providers.gradleProperty("untilBuild").get()
 group = "io.flutter"
-version = flutterPluginVersion
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-  kotlinOptions {
-    jvmTarget = javaVersion
+kotlin {
+  compilerOptions {
+    apiVersion.set(KotlinVersion.KOTLIN_1_9)
+    jvmTarget = JvmTarget.JVM_17
   }
 }
-
+val javaCompatibilityVersion = JavaVersion.VERSION_17
 java {
-  sourceCompatibility = JavaVersion.toVersion(javaVersion)
-  targetCompatibility = JavaVersion.toVersion(javaVersion)
+  sourceCompatibility = javaCompatibilityVersion
+  targetCompatibility = javaCompatibilityVersion
 }
 
-intellij {
-  // This adds nullability assertions, but also compiles forms.
-  instrumentCode.set(true)
-  updateSinceUntilBuild.set(false)
-  downloadSources.set(false)
-  version.set(ideVersion)
-  val pluginList = mutableListOf("java", "properties", "junit", "Kotlin", "Git4Idea",
-             "gradle", "Groovy", "yaml", "Dart:$dartVersion")
+dependencies {
+  intellijPlatform {
+    if (ideaProduct == "android-studio") {
+      create(IntelliJPlatformType.AndroidStudio, ideaVersion)
+    } else { // if (ideaProduct == "IC") {
+      create(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+    }
+    testFramework(TestFrameworkType.Platform)
+    val bundledPluginList = mutableListOf(
+      "com.intellij.java",
+      "com.intellij.properties",
+      "JUnit",
+      "Git4Idea",
+      "org.jetbrains.kotlin",
+      "org.jetbrains.plugins.gradle",
+      "org.intellij.intelliLang",
+    )
+    if (ideaProduct == "android-studio") {
+      bundledPluginList.add("org.jetbrains.android")
+      bundledPluginList.add("com.android.tools.idea.smali")
+    }
+    val pluginList = mutableListOf("Dart:$dartPluginVersion")
+    if (ideaProduct == "IC") {
+      pluginList.add("org.jetbrains.android:$androidPluginVersion")
+    }
 
-  // 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") {
-    pluginList.add("org.jetbrains.android");
-  } else if (ide == "ideaIC") {
-    pluginList.add("org.jetbrains.android:$androidVersion");
+    // Finally, add the plugins into their respective lists:
+    // https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html#project-setup
+    bundledPlugins(bundledPluginList)
+    plugins(pluginList)
+
+    // The warning that "instrumentationTools()" is deprecated might be valid, however, this error is produced by Gradle IJ plugin version
+    // 2.1.0 if this isn't included:
+    //  Caused by: org.gradle.api.GradleException: No Java Compiler dependency found.
+    //  Please ensure the `instrumentationTools()` entry is present in the project dependencies section along with the `intellijDependencies()` entry in the repositories section.
+    //  See: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
+    instrumentationTools()
+//    pluginVerifier()
   }
-  if (ide == "android-studio") {
-    pluginList.add(smaliPlugin)
-  }
-  pluginList.add(langPlugin)
-  plugins.set(pluginList)
-  if (ide == "android-studio") {
-    type.set("AI")
+}
+
+intellijPlatform {
+  pluginConfiguration {
+    version = flutterPluginVersion
+    ideaVersion {
+      sinceBuild = sinceBuildInput
+      untilBuild = untilBuildInput
+    }
   }
+  // TODO (jwren) get the verifier to work, and enable in the github presubmit,
+  //  the com.teamdev dep is having the verifier fail
+  // Verifier documentation: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html#intellijPlatform-pluginVerification-ides
+//  pluginVerification {
+//    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#mutePluginVerifierProblems
+//    freeArgs = listOf(
+//      "-mute",
+//      "TemplateWordInPluginId"
+//    )
+//    ides {
+//      if (ideaProduct == "android-studio") {
+//        ide(IntelliJPlatformType.AndroidStudio, ideaVersion)
+//      } else {
+//          ide(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+//        }
+//      recommended()
+////      select {
+////        types = listOf(IntelliJPlatformType.AndroidStudio)
+////        channels = listOf(ProductRelease.Channel.RELEASE)
+////        sinceBuild = sinceBuildInput
+////        untilBuild = untilBuildInput
+////      }
+//    }
+//  }
 }
 
 dependencies {
@@ -82,36 +128,36 @@ dependencies {
   testImplementation("org.powermock:powermock-api-mockito2:2.0.9")
   testImplementation("org.powermock:powermock-module-junit4:2.0.9")
   testImplementation(mapOf("group" to "org.mockito", "name" to "mockito-core", "version" to "5.2.0"))
-  if (ide == "android-studio") {
+  if (ideaProduct == "android-studio") {
     testImplementation(project(":flutter-studio"))
     testRuntimeOnly(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/android-studio/plugins",
-                         "include" to listOf("**/*.jar"),
-                         "exclude" to listOf("**/kotlin-compiler.jar", "**/kotlin-plugin.jar", "**/kotlin-stdlib-jdk8.jar"))))
+      "include" to listOf("**/*.jar"),
+      "exclude" to listOf("**/kotlin-compiler.jar", "**/kotlin-plugin.jar", "**/kotlin-stdlib-jdk8.jar"))))
     compileOnly(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/android-studio/lib",
       "include" to listOf("*.jar"),
       "exclude" to listOf("**/annotations.jar"))))
     testRuntimeOnly(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/android-studio/lib",
       "include" to listOf("*.jar"))))
     compileOnly(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/android-studio/plugins/git4idea/lib",
-                         "include" to listOf("*.jar"))))
+      "include" to listOf("*.jar"))))
     testImplementation(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/android-studio/plugins/git4idea/lib",
-                         "include" to listOf("*.jar"))))
+      "include" to listOf("*.jar"))))
   } else {
     compileOnly(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/ideaIC/plugins/git4idea/lib",
       "include" to listOf("*.jar"))))
     compileOnly(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/ideaIC/plugins/java/lib",
       "include" to listOf("*.jar"))))
     testImplementation(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/ideaIC/plugins/git4idea/lib",
-                         "include" to listOf("*.jar"))))
+      "include" to listOf("*.jar"))))
   }
   compileOnly("com.google.guava:guava:32.0.0-android")
   compileOnly("com.google.code.gson:gson:2.10.1")
   testImplementation("com.google.guava:guava:32.0.0-jre")
   testImplementation("com.google.code.gson:gson:2.10.1")
   compileOnly(fileTree(mapOf("dir" to "${project.rootDir}/third_party/lib/jxbrowser",
-                       "include" to listOf("*.jar"))))
+    "include" to listOf("*.jar"))))
   testImplementation(fileTree(mapOf("dir" to "${project.rootDir}/third_party/lib/jxbrowser",
-                       "include" to listOf("*.jar"))))
+    "include" to listOf("*.jar"))))
   testImplementation("junit:junit:4.13.2")
 }
 
@@ -142,19 +188,12 @@ sourceSets {
 }
 
 tasks {
-
-  buildSearchableOptions {
+  prepareJarSearchableOptions {
     enabled = false
   }
-
-  instrumentCode {
-    compilerVersion.set(baseVersion)
-  }
-
-  instrumentTestCode {
-    compilerVersion.set(baseVersion)
+  buildSearchableOptions {
+    enabled = false
   }
-
   test {
     useJUnit()
     testLogging {
@@ -166,4 +205,3 @@ tasks {
     }
   }
 }
-
diff --git a/flutter-idea/settings.gradle.kts b/flutter-idea/settings.gradle.kts
new file mode 100644
index 0000000000..88b07c8ca7
--- /dev/null
+++ b/flutter-idea/settings.gradle.kts
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2020 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+pluginManagement {
+  repositories {
+    maven("https://oss.sonatype.org/content/repositories/snapshots/")
+    gradlePluginPortal()
+  }
+}
diff --git a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageAnnotator.java b/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageAnnotator.java
deleted file mode 100644
index ace1053c54..0000000000
--- a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageAnnotator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2021 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-package io.flutter.run.coverage;
-
-import com.intellij.coverage.CoverageDataManager;
-import com.intellij.coverage.CoverageSuitesBundle;
-import com.intellij.coverage.SimpleCoverageAnnotator;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.vfs.VirtualFile;
-import io.flutter.utils.FlutterModuleUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class FlutterCoverageAnnotator extends SimpleCoverageAnnotator {
-
-  @Nullable
-  public static FlutterCoverageAnnotator getInstance(Project project) {
-    return project.getService(FlutterCoverageAnnotator.class);
-  }
-
-  public FlutterCoverageAnnotator(Project project) {
-    super(project);
-  }
-
-  @Override
-  protected FileCoverageInfo fillInfoForUncoveredFile(@NotNull File file) {
-    return new FileCoverageInfo();
-  }
-
-  @Override
-  protected boolean shouldCollectCoverageInsideLibraryDirs() {
-    return false;
-  }
-
-  @Override
-  protected VirtualFile[] getRoots(Project project,
-                                   @NotNull CoverageDataManager dataManager,
-                                   CoverageSuitesBundle suite) {
-    return dataManager.doInReadActionIfProjectOpen(() -> {
-      final List<VirtualFile> roots = new ArrayList<>();
-      for (Module module : FlutterModuleUtils.findModulesWithFlutterContents(project)) {
-        final ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
-        roots.addAll(Arrays.asList(rootManager.getContentRoots()));
-      }
-      return roots.toArray(VirtualFile.EMPTY_ARRAY);
-    });
-  }
-}
diff --git a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageEnabledConfiguration.java b/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageEnabledConfiguration.java
deleted file mode 100644
index 4bafadd28c..0000000000
--- a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageEnabledConfiguration.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2021 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-package io.flutter.run.coverage;
-
-import com.intellij.coverage.CoverageDataManager;
-import com.intellij.coverage.CoverageRunner;
-import com.intellij.execution.configurations.RunConfigurationBase;
-import com.intellij.execution.configurations.coverage.CoverageEnabledConfiguration;
-import com.intellij.openapi.application.ModalityState;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.ModalityUiUtil;
-import io.flutter.pub.PubRoot;
-import io.flutter.run.test.TestConfig;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class FlutterCoverageEnabledConfiguration extends CoverageEnabledConfiguration {
-  private static final Logger LOG = Logger.getInstance(FlutterCoverageEnabledConfiguration.class.getName());
-
-  public FlutterCoverageEnabledConfiguration(@NotNull RunConfigurationBase<?> configuration) {
-    super(configuration);
-    super.setCoverageRunner(CoverageRunner.getInstance(FlutterCoverageRunner.class));
-    createCoverageFile();
-    ModalityUiUtil.invokeLaterIfNeeded(
-      ModalityState.any(),
-      () -> setCurrentCoverageSuite(CoverageDataManager.getInstance(configuration.getProject()).addCoverageSuite(this)));
-  }
-
-  @Override
-  protected String createCoverageFile() {
-    if (myCoverageFilePath == null) {
-      if (!(getConfiguration() instanceof TestConfig)) {
-        return "";
-      }
-      VirtualFile file = ((TestConfig)getConfiguration()).getFields().getFileOrDir();
-      final VirtualFile root = PubRoot.forFile(file).getRoot();
-      myCoverageFilePath = root.getPath() + "/coverage/lcov.info";
-    }
-    return myCoverageFilePath;
-  }
-
-  @Override
-  public void setCoverageRunner(@Nullable final CoverageRunner coverageRunner) {
-    // Save and restore myCoverageFilePath because the super method clears it.
-    final String path = myCoverageFilePath;
-    super.setCoverageRunner(coverageRunner);
-    myCoverageFilePath = path;
-  }
-
-  @Override
-  public void coverageRunnerExtensionRemoved(@NotNull CoverageRunner runner) {
-    final String path = myCoverageFilePath;
-    super.coverageRunnerExtensionRemoved(runner);
-    myCoverageFilePath = path;
-  }
-}
diff --git a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageEngine.java b/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageEngine.java
deleted file mode 100644
index a1d31ee174..0000000000
--- a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageEngine.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2021 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-package io.flutter.run.coverage;
-
-import com.intellij.coverage.CoverageAnnotator;
-import com.intellij.coverage.CoverageEngine;
-import com.intellij.coverage.CoverageFileProvider;
-import com.intellij.coverage.CoverageRunner;
-import com.intellij.coverage.CoverageSuite;
-import com.intellij.coverage.CoverageSuitesBundle;
-import com.intellij.execution.configurations.RunConfigurationBase;
-import com.intellij.execution.configurations.RunProfile;
-import com.intellij.execution.configurations.WrappingRunConfiguration;
-import com.intellij.execution.configurations.coverage.CoverageEnabledConfiguration;
-import com.intellij.execution.testframework.AbstractTestProxy;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.jetbrains.lang.dart.DartFileType;
-import com.jetbrains.lang.dart.psi.DartFile;
-import io.flutter.FlutterBundle;
-import io.flutter.FlutterUtils;
-import io.flutter.pub.PubRoot;
-import io.flutter.run.test.TestConfig;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class FlutterCoverageEngine extends CoverageEngine {
-
-  public static FlutterCoverageEngine getInstance() {
-    return CoverageEngine.EP_NAME.findExtensionOrFail(FlutterCoverageEngine.class);
-  }
-
-  @Override
-  public boolean isApplicableTo(@NotNull RunConfigurationBase conf) {
-    return unwrapRunProfile(conf) instanceof TestConfig;
-  }
-
-  @Override
-  public boolean canHavePerTestCoverage(@NotNull RunConfigurationBase conf) {
-    return true;
-  }
-
-  @Override
-  public @NotNull CoverageEnabledConfiguration createCoverageEnabledConfiguration(@NotNull RunConfigurationBase conf) {
-    return new FlutterCoverageEnabledConfiguration(conf);
-  }
-
-  @Override
-  public @Nullable CoverageSuite createCoverageSuite(@NotNull CoverageRunner covRunner,
-                                                     @NotNull String name,
-                                                     @NotNull CoverageFileProvider coverageDataFileProvider,
-                                                     @Nullable String[] filters,
-                                                     long lastCoverageTimeStamp,
-                                                     @Nullable String suiteToMerge,
-                                                     boolean coverageByTestEnabled,
-                                                     boolean tracingEnabled,
-                                                     boolean trackTestFolders,
-                                                     Project project) {
-    return null;
-  }
-
-  @Override
-  public @Nullable CoverageSuite createCoverageSuite(@NotNull CoverageRunner covRunner,
-                                                     @NotNull String name,
-                                                     @NotNull CoverageFileProvider coverageDataFileProvider,
-                                                     @NotNull CoverageEnabledConfiguration config) {
-    if (config instanceof FlutterCoverageEnabledConfiguration) {
-      return new FlutterCoverageSuite(covRunner, name, coverageDataFileProvider,
-                                      config.getConfiguration().getProject(), this);
-    }
-    return null;
-  }
-
-  @Override
-  public @Nullable CoverageSuite createEmptyCoverageSuite(@NotNull CoverageRunner coverageRunner) {
-    return new FlutterCoverageSuite(this);
-  }
-
-  @Override
-  public @NotNull CoverageAnnotator getCoverageAnnotator(Project project) {
-    return FlutterCoverageAnnotator.getInstance(project);
-  }
-
-  @Override
-  public boolean coverageEditorHighlightingApplicableTo(@NotNull PsiFile psiFile) {
-    final PubRoot root = PubRoot.forPsiFile(psiFile);
-    if (root == null) return false;
-    final VirtualFile file = psiFile.getVirtualFile();
-    if (file == null) return false;
-    final String path = root.getRelativePath(file);
-    if (path == null) return false;
-    return path.startsWith("lib") && FlutterUtils.isDartFile(file);
-  }
-
-  @Override
-  public boolean coverageProjectViewStatisticsApplicableTo(VirtualFile fileOrDir) {
-    return !fileOrDir.isDirectory() && fileOrDir.getFileType() instanceof DartFileType;
-  }
-
-  @Override
-  public boolean acceptedByFilters(@NotNull PsiFile psiFile, @NotNull CoverageSuitesBundle suite) {
-    return psiFile instanceof DartFile;
-  }
-
-  @Override
-  public boolean recompileProjectAndRerunAction(@NotNull Module module,
-                                                @NotNull CoverageSuitesBundle suite,
-                                                @NotNull Runnable chooseSuiteAction) {
-    return false;
-  }
-
-  @Override
-  public String getQualifiedName(@NotNull final File outputFile,
-                                 @NotNull final PsiFile sourceFile) {
-    return getQName(sourceFile);
-  }
-
-  @Override
-  public @NotNull Set<String> getQualifiedNames(@NotNull PsiFile sourceFile) {
-    final Set<String> qualifiedNames = new HashSet<>();
-    qualifiedNames.add(getQName(sourceFile));
-    return qualifiedNames;
-  }
-
-  @Override
-  public List<PsiElement> findTestsByNames(@NotNull String[] testNames, @NotNull Project project) {
-    return null;
-  }
-
-  @Override
-  public @Nullable String getTestMethodName(@NotNull PsiElement element, @NotNull AbstractTestProxy testProxy) {
-    return null;
-  }
-
-  @Override
-  public String getPresentableText() {
-    return FlutterBundle.message("flutter.coverage.presentable.text");
-  }
-
-  @NotNull
-  private static String getQName(@NotNull PsiFile sourceFile) {
-    return sourceFile.getVirtualFile().getPath();
-  }
-
-  static @NotNull RunProfile unwrapRunProfile(@NotNull RunProfile runProfile) {
-    if (runProfile instanceof WrappingRunConfiguration) {
-      return ((WrappingRunConfiguration<?>)runProfile).getPeer();
-    }
-    return runProfile;
-  }
-}
diff --git a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageProgramRunner.java b/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageProgramRunner.java
deleted file mode 100644
index 9e6bd4e082..0000000000
--- a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageProgramRunner.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2021 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-package io.flutter.run.coverage;
-
-import com.intellij.coverage.CoverageDataManager;
-import com.intellij.coverage.CoverageExecutor;
-import com.intellij.coverage.CoverageRunnerData;
-import com.intellij.execution.ExecutionException;
-import com.intellij.execution.configurations.ConfigurationInfoProvider;
-import com.intellij.execution.configurations.RunProfile;
-import com.intellij.execution.configurations.RunProfileState;
-import com.intellij.execution.configurations.RunnerSettings;
-import com.intellij.execution.configurations.coverage.CoverageEnabledConfiguration;
-import com.intellij.execution.process.ProcessAdapter;
-import com.intellij.execution.process.ProcessEvent;
-import com.intellij.execution.process.ProcessHandler;
-import com.intellij.execution.runners.DefaultProgramRunnerKt;
-import com.intellij.execution.runners.ExecutionEnvironment;
-import com.intellij.execution.runners.GenericProgramRunner;
-import com.intellij.execution.ui.RunContentDescriptor;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VfsUtil;
-import io.flutter.FlutterBundle;
-import io.flutter.run.test.TestConfig;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public class FlutterCoverageProgramRunner extends GenericProgramRunner<RunnerSettings> {
-  private static final Logger LOG = Logger.getInstance(FlutterCoverageProgramRunner.class.getName());
-
-  private static final String ID = "FlutterCoverageProgramRunner";
-  private ProcessHandler handler;
-  private ProcessAdapter listener;
-
-  @Override
-  public @NotNull
-  @NonNls
-  String getRunnerId() {
-    return ID;
-  }
-
-  @Override
-  public boolean canRun(@NotNull String executorId, @NotNull RunProfile profile) {
-    return executorId.equals(CoverageExecutor.EXECUTOR_ID) && profile instanceof TestConfig;
-  }
-
-  @Override
-  public RunnerSettings createConfigurationData(@NotNull final ConfigurationInfoProvider settingsProvider) {
-    return new CoverageRunnerData();
-  }
-
-  @Override
-  @Nullable
-  protected RunContentDescriptor doExecute(final @NotNull RunProfileState state,
-                                           final @NotNull ExecutionEnvironment env) throws ExecutionException {
-    final RunContentDescriptor result = DefaultProgramRunnerKt.executeState(state, env, this);
-    if (result == null) {
-      return null;
-    }
-    handler = result.getProcessHandler();
-    if (handler != null) {
-      listener = new ProcessAdapter() {
-        @Override
-        public void processTerminated(@NotNull ProcessEvent event) {
-          ApplicationManager.getApplication().invokeLater(() -> processCoverage(env));
-        }
-      };
-      handler.addProcessListener(listener);
-    }
-    return result;
-  }
-
-  private void processCoverage(ExecutionEnvironment env) {
-    if (!(env.getRunProfile() instanceof TestConfig runConfig)) return;
-    final CoverageEnabledConfiguration configuration = CoverageEnabledConfiguration.getOrCreate(runConfig);
-    if (configuration.getCoverageFilePath() == null) return;
-
-    final Path path = Paths.get(configuration.getCoverageFilePath());
-    final Path cov = path.getParent();
-    VfsUtil.markDirtyAndRefresh(false, false, true, LocalFileSystem.getInstance().findFileByPath(cov.getParent().toString()));
-    VfsUtil.markDirtyAndRefresh(false, true, true, LocalFileSystem.getInstance().findFileByPath(cov.toString()));
-    if (Files.exists(path)) {
-      @Nullable final RunnerSettings settings = env.getRunnerSettings();
-      if (settings != null) {
-        CoverageDataManager.getInstance(env.getProject()).processGatheredCoverage(runConfig, settings);
-        handler.removeProcessListener(listener);
-        handler = null;
-        listener = null;
-      }
-    }
-    else {
-      LOG.error(FlutterBundle.message("coverage.path.not.found", path));
-    }
-  }
-}
diff --git a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageRunner.java b/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageRunner.java
deleted file mode 100644
index bc9cee2ca1..0000000000
--- a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageRunner.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2021 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-package io.flutter.run.coverage;
-
-import com.intellij.coverage.CoverageEngine;
-import com.intellij.coverage.CoverageRunner;
-import com.intellij.coverage.CoverageSuite;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.rt.coverage.data.ProjectData;
-import io.flutter.FlutterBundle;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.File;
-import java.io.IOException;
-
-public class FlutterCoverageRunner extends CoverageRunner {
-  private static final String ID = "FlutterCoverageRunner";
-  private static final Logger LOG = Logger.getInstance(FlutterCoverageRunner.class.getName());
-
-  @Nullable
-  @Override
-  public ProjectData loadCoverageData(@NotNull final File sessionDataFile, @Nullable CoverageSuite baseCoverageSuite) {
-    if (!(baseCoverageSuite instanceof FlutterCoverageSuite)) {
-      return null;
-    }
-    return doLoadCoverageData(sessionDataFile, (FlutterCoverageSuite)baseCoverageSuite);
-  }
-
-  @Nullable
-  private static ProjectData doLoadCoverageData(@NotNull final File sessionDataFile, @NotNull final FlutterCoverageSuite coverageSuite) {
-    final ProjectData projectData = new ProjectData();
-    try {
-      LcovInfo.readInto(projectData, sessionDataFile);
-    }
-    catch (IOException ex) {
-      LOG.warn(FlutterBundle.message("coverage.data.not.read", sessionDataFile.getAbsolutePath()));
-      return null;
-    }
-    return projectData;
-  }
-
-  @NotNull
-  @Override
-  public String getPresentableName() {
-    return "Flutter";
-  }
-
-  @NotNull
-  @Override
-  public String getId() {
-    return ID;
-  }
-
-  @NotNull
-  @Override
-  public String getDataFileExtension() {
-    return "info";
-  }
-
-  @Override
-  public boolean acceptsCoverageEngine(@NotNull CoverageEngine engine) {
-    return engine instanceof FlutterCoverageEngine;
-  }
-}
-
diff --git a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageSuite.java b/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageSuite.java
deleted file mode 100644
index 6ba6f18108..0000000000
--- a/flutter-idea/src/io/flutter/run/coverage/FlutterCoverageSuite.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2021 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-package io.flutter.run.coverage;
-
-import com.intellij.coverage.BaseCoverageSuite;
-import com.intellij.coverage.CoverageEngine;
-import com.intellij.coverage.CoverageFileProvider;
-import com.intellij.coverage.CoverageRunner;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
-
-public class FlutterCoverageSuite extends BaseCoverageSuite {
-
-  @NotNull final private FlutterCoverageEngine coverageEngine;
-
-  public FlutterCoverageSuite(@NotNull FlutterCoverageEngine coverageEngine) {
-    this.coverageEngine = coverageEngine;
-  }
-
-  public FlutterCoverageSuite(CoverageRunner runner,
-                              String name,
-                              CoverageFileProvider coverageDataFileProvider,
-                              Project project,
-                              @NotNull FlutterCoverageEngine coverageEngine
-  ) {
-    super(name, coverageDataFileProvider, System.currentTimeMillis(), false, false,
-          false, runner, project);
-    this.coverageEngine = coverageEngine;
-  }
-
-  @Override
-  public @NotNull CoverageEngine getCoverageEngine() {
-    return coverageEngine;
-  }
-
-  @Override
-  public void deleteCachedCoverageData() {
-  }
-}
diff --git a/flutter-idea/src/io/flutter/run/coverage/LcovInfo.java b/flutter-idea/src/io/flutter/run/coverage/LcovInfo.java
deleted file mode 100644
index 885756f28c..0000000000
--- a/flutter-idea/src/io/flutter/run/coverage/LcovInfo.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright 2021 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-package io.flutter.run.coverage;
-
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.SystemInfo;
-import com.intellij.rt.coverage.data.ClassData;
-import com.intellij.rt.coverage.data.LineData;
-import com.intellij.rt.coverage.data.ProjectData;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-public class LcovInfo {
-  private static final Logger LOG = Logger.getInstance(LcovInfo.class.getName());
-
-  private static final String FILE_LABEL = "SF:";
-  private static final String DATA_LABEL = "DA:";
-  private static final String END_LABEL = "end_of_record";
-
-  private final Map<String, List<LineCount>> counts = new HashMap<>();
-
-  private Path currentFile = null;
-  private List<LineCount> lineCounts = null;
-  private final String base;
-
-  private LcovInfo(String base) {
-    this.base = base;
-  }
-
-  public static void readInto(@NotNull ProjectData data, @NotNull File file) throws IOException {
-    final String filePath = file.getAbsolutePath();
-    final int index = filePath.indexOf("coverage");
-    if (index < 0) {
-      // TODO Define at least one class in data
-      return;
-    }
-    final LcovInfo lcov = new LcovInfo(filePath.substring(0, index));
-    try (final Stream<String> lines = Files.lines(file.toPath())) {
-      lines.forEach(lcov::processLine);
-    }
-    for (String path : lcov.counts.keySet()) {
-      final List<LineCount> list = lcov.counts.get(path);
-      if (list == null || list.isEmpty()) {
-        continue;
-      }
-      final ClassData classData = data.getOrCreateClassData(path);
-      classData.setSource(fullPath(path));
-      final int max = list.get(list.size() - 1).lineNum + 1;
-      final LineData[] lines = new LineData[max];
-      for (LineCount line : list) {
-        final LineData lineData = new LineData(line.lineNum, null);
-        lineData.setHits(line.execCount);
-        lines[line.lineNum] = lineData;
-        classData.registerMethodSignature(lineData);
-      }
-      classData.setLines(lines);
-    }
-  }
-
-  void processLine(String line) {
-    line = line.trim();
-    if (line.startsWith(DATA_LABEL)) {
-      assert currentFile != null;
-      assert lineCounts != null;
-      addLineCount(line.substring(DATA_LABEL.length()));
-    }
-    else if (line.startsWith(FILE_LABEL)) {
-      //currentFile = Paths.get(line.substring(FILE_LABEL.length())).normalize();
-      final File file = new File(base, line.substring(FILE_LABEL.length()));
-      final URI normalize = file.toURI().normalize();
-      currentFile = Paths.get(normalize);
-      lineCounts = new ArrayList<>();
-    }
-    else if (line.equals(END_LABEL)) {
-      storeLineCounts();
-      currentFile = null;
-      lineCounts = null;
-    }
-  }
-
-  private void addLineCount(String data) {
-    final String[] parts = data.split(",");
-    assert parts.length >= 2;
-    final int lineNum = safelyParse(parts[0]);
-    final int execCount = safelyParse(parts[1]);
-    lineCounts.add(new LineCount(lineNum, execCount));
-  }
-
-  private static int safelyParse(String val) {
-    try {
-      return Integer.parseInt(val);
-    }
-    catch (NumberFormatException ex) {
-      return 0;
-    }
-  }
-
-  private void storeLineCounts() {
-    final String path = fullPath(currentFile.toString());
-    counts.put(path, lineCounts);
-  }
-
-  private static String fullPath(String path) {
-    String absPath = new File(path).getAbsolutePath();
-    if (SystemInfo.isWindows) {
-      absPath = absPath.replaceAll("\\\\", "/");
-    }
-    return absPath;
-  }
-
-  private static class LineCount {
-    int lineNum;
-    int execCount;
-
-    public LineCount(int num, int count) {
-      lineNum = num;
-      execCount = count;
-    }
-  }
-}
diff --git a/flutter-idea/testSrc/unit/io/flutter/coverage/LcovInfoTest.java b/flutter-idea/testSrc/unit/io/flutter/coverage/LcovInfoTest.java
deleted file mode 100644
index a910d39abc..0000000000
--- a/flutter-idea/testSrc/unit/io/flutter/coverage/LcovInfoTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-package io.flutter.coverage;
-
-import com.intellij.rt.coverage.data.ProjectData;
-import io.flutter.run.coverage.LcovInfo;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-
-public class LcovInfoTest {
-
-  @Test
-  public void testReadData() throws IOException {
-    final File sessionDataFile = new File("testData/coverage", "lcov.info");
-    final ProjectData projectData = new ProjectData();
-    LcovInfo.readInto(projectData, sessionDataFile);
-    // The file contains data for one class, with 110 lines, but we don't know the class name.
-    projectData.getClasses().entrySet().iterator().forEachRemaining(entry -> {
-      assertEquals(110, entry.getValue().getLines().length);
-    });
-  }
-}
diff --git a/flutter-idea/testSrc/unit/io/flutter/editor/FlutterIconLineMarkerTest.java b/flutter-idea/testSrc/unit/io/flutter/editor/FlutterIconLineMarkerTest.java
index 4a074751d2..d28eeab407 100644
--- a/flutter-idea/testSrc/unit/io/flutter/editor/FlutterIconLineMarkerTest.java
+++ b/flutter-idea/testSrc/unit/io/flutter/editor/FlutterIconLineMarkerTest.java
@@ -14,6 +14,7 @@
 import io.flutter.dart.DartSyntax;
 import io.flutter.sdk.FlutterSdk;
 import io.flutter.sdk.FlutterSdkVersion;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.mockito.Mockito.mock;
@@ -45,7 +46,7 @@ public void testLocatesIconsReference() throws Exception {
     assertNotNull(element);
   }
 
-  @Test
+  @Test @Ignore
   public void testLocatesIconCtor() throws Exception {
     final PsiElement testIdentifier =
       setUpDartElement("main() { IconData(0xe190, fontFamily: 'MaterialIcons'); }", "IconData", LeafPsiElement.class);
@@ -54,7 +55,7 @@ public void testLocatesIconCtor() throws Exception {
     final DartCallExpression element = DartSyntax.findEnclosingFunctionCall(testIdentifier, "IconData");
     assertNotNull(element);
   }
-  //
+
   //@Test @Ignore("file not found")
   //public void testLocatesCupertinoIconCtor() throws Exception {
   //  final PsiElement testIdentifier =
@@ -65,7 +66,7 @@ public void testLocatesIconCtor() throws Exception {
   //  assertNotNull(element);
   //}
 
-  @Test
+  @Test @Ignore
   public void testLocatesConstIconCtor() throws Exception {
     final PsiElement testIdentifier =
       setUpDartElement("main() { const IconData(0xe190, fontFamily: 'MaterialIcons'); }", "IconData", LeafPsiElement.class);
diff --git a/flutter-studio/build.gradle.kts b/flutter-studio/build.gradle.kts
index ca38760bd4..32a059f1fd 100644
--- a/flutter-studio/build.gradle.kts
+++ b/flutter-studio/build.gradle.kts
@@ -1,70 +1,101 @@
 /*
- * Copyright 2020 The Chromium Authors. All rights reserved.
+ * Copyright 2024 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
 repositories {
   mavenCentral()
-  maven {
-    url=uri("https://oss.sonatype.org/content/repositories/snapshots/")
+  intellijPlatform {
+    defaultRepositories()
   }
 }
 
+// See https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-plugins.html#module,
+// flutter-studio is a submodule importing org.jetbrains.intellij.platform.module.
+
 plugins {
+  // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html
+  // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
   id("java")
-  id("kotlin")
-  id("org.jetbrains.intellij")
+  id("org.jetbrains.intellij.platform.module")
+  id("org.jetbrains.kotlin.jvm") version "2.0.0"
 }
 
-val ide: String by project
-val flutterPluginVersion: String by project
-val javaVersion: String by project
-val androidVersion: String by project
-val dartVersion: String by project
-val baseVersion: String by project
-val smaliPlugin: String by project
-val langPlugin: String by project
-val ideVersion: String by project
-
+val flutterPluginVersion = providers.gradleProperty("flutterPluginVersion").get()
+val ideaProduct = providers.gradleProperty("ideaProduct").get()
+val ideaVersion = providers.gradleProperty("ideaVersion").get()
+val dartPluginVersion = providers.gradleProperty("dartPluginVersion").get()
+// The Android Plugin version is only used if the ideaProduct is not "android-studio"
+val androidPluginVersion = providers.gradleProperty("androidPluginVersion").get()
+val sinceBuildInput = providers.gradleProperty("sinceBuild").get()
+val untilBuildInput = providers.gradleProperty("untilBuild").get()
 group = "io.flutter"
-version = flutterPluginVersion
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-  kotlinOptions {
-    jvmTarget = javaVersion
+kotlin {
+  compilerOptions {
+    apiVersion.set(KotlinVersion.KOTLIN_1_9)
+    jvmTarget = JvmTarget.JVM_17
   }
 }
-
+val javaCompatibilityVersion = JavaVersion.VERSION_17
 java {
-  sourceCompatibility = JavaVersion.toVersion(javaVersion)
-  targetCompatibility = JavaVersion.toVersion(javaVersion)
+  sourceCompatibility = javaCompatibilityVersion
+  targetCompatibility = javaCompatibilityVersion
 }
 
-intellij {
-  // This adds nullability assertions, but also compiles forms.
-  instrumentCode.set(true)
-  updateSinceUntilBuild.set(false)
-  downloadSources.set(false)
-  version.set(ideVersion)
-  val pluginList = mutableListOf("java", "Dart:$dartVersion", "properties", "junit",
-             "gradle", "Groovy")
-
-  // 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") {
-    pluginList.add("org.jetbrains.android")
-  } else if (ide == "ideaIC") {
-    pluginList.add("org.jetbrains.android:$androidVersion")
+dependencies {
+  intellijPlatform {
+    if (ideaProduct == "android-studio") {
+      create(IntelliJPlatformType.AndroidStudio, ideaVersion)
+    } else { // if (ideaProduct == "IC") {
+      create(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+    }
+    testFramework(TestFrameworkType.Platform)
+    val bundledPluginList = mutableListOf(
+      "com.intellij.java",
+      "com.intellij.properties",
+      "JUnit",
+      "Git4Idea",
+      "org.jetbrains.kotlin",
+      "org.jetbrains.plugins.gradle",
+      "org.intellij.intelliLang",
+    )
+    if (ideaProduct == "android-studio") {
+      bundledPluginList.add("org.jetbrains.android")
+      bundledPluginList.add("com.android.tools.idea.smali")
+    }
+    val pluginList = mutableListOf("Dart:$dartPluginVersion")
+    if (ideaProduct == "IC") {
+      pluginList.add("org.jetbrains.android:$androidPluginVersion")
+    }
+
+    // Finally, add the plugins into their respective lists:
+    // https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html#project-setup
+    bundledPlugins(bundledPluginList)
+    plugins(pluginList)
+
+    // The warning that "instrumentationTools()" is deprecated might be valid, however, this error is produced by Gradle IJ plugin version
+    // 2.1.0 if this isn't included:
+    //  Caused by: org.gradle.api.GradleException: No Java Compiler dependency found.
+    //  Please ensure the `instrumentationTools()` entry is present in the project dependencies section along with the `intellijDependencies()` entry in the repositories section.
+    //  See: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
+    instrumentationTools()
   }
+}
 
-  if (ideVersion != "2023.2") {
-    pluginList.add(smaliPlugin)
-  }
-  pluginList.add(langPlugin)
-  plugins.set(pluginList)
-  if (ide == "android-studio") {
-    type.set("AI")
+intellijPlatform {
+  pluginConfiguration {
+    version = flutterPluginVersion
+    ideaVersion {
+      sinceBuild = sinceBuildInput
+      untilBuild = untilBuildInput
+    }
   }
 }
 
@@ -72,15 +103,15 @@ dependencies {
   compileOnly(project(":flutter-idea"))
   testImplementation(project(":flutter-idea"))
   compileOnly(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/android-studio/lib",
-                         "include" to listOf("*.jar"))))
+    "include" to listOf("*.jar"))))
   testImplementation(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/android-studio/lib",
-                         "include" to listOf("*.jar"))))
+    "include" to listOf("*.jar"))))
   compileOnly(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/android-studio/plugins",
-                         "include" to listOf("**/*.jar"),
-                         "exclude" to listOf("**/kotlin-compiler.jar", "**/kotlin-plugin.jar"))))
+    "include" to listOf("**/*.jar"),
+    "exclude" to listOf("**/kotlin-compiler.jar", "**/kotlin-plugin.jar"))))
   testImplementation(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/android-studio/plugins",
-                         "include" to listOf("**/*.jar"),
-                         "exclude" to listOf("**/kotlin-compiler.jar", "**/kotlin-plugin.jar"))))
+    "include" to listOf("**/*.jar"),
+    "exclude" to listOf("**/kotlin-compiler.jar", "**/kotlin-plugin.jar"))))
 }
 
 sourceSets {
@@ -88,34 +119,6 @@ sourceSets {
     java.srcDirs(listOf(
       "src",
       "third_party/vmServiceDrivers"
-      //"resources"
     ))
-    // Add kotlin.srcDirs if we start using Kotlin in the main plugin.
-    //resources.srcDirs(listOf(
-      //"src",
-      //project(":flutter-idea").sourceSets.main.get().resources
-      //"resources",
-    //))
-  }
-}
-
-tasks {
-
-  buildSearchableOptions {
-    enabled = false
-  }
-
-  instrumentCode {
-    compilerVersion.set(baseVersion)
-  }
-
-  instrumentTestCode {
-    compilerVersion.set(baseVersion)
-  }
-
-  verifyPlugin {
-    // verifyPlugin fails when no descriptor is provided, however with the way we create the final product,
-    // there is no descriptor in the studio plugin.xml
-    ignoreFailures.set(true)
   }
 }
diff --git a/flutter-studio/src/io/flutter/editor/AndroidStudioColorPickerProvider.java b/flutter-studio/src/io/flutter/editor/AndroidStudioColorPickerProvider.java
index 6a7d405e88..78fbe72040 100644
--- a/flutter-studio/src/io/flutter/editor/AndroidStudioColorPickerProvider.java
+++ b/flutter-studio/src/io/flutter/editor/AndroidStudioColorPickerProvider.java
@@ -5,11 +5,12 @@
  */
 package io.flutter.editor;
 
-import com.android.tools.idea.ui.resourcechooser.colorpicker2.ColorPickerBuilder;
+import com.intellij.ui.colorpicker.ColorPickerBuilder;
 import com.intellij.openapi.ui.popup.Balloon;
 import com.intellij.openapi.ui.popup.BalloonBuilder;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.ui.awt.RelativePoint;
+import com.intellij.ui.colorpicker.LightCalloutPopup;
 import kotlin.Unit;
 
 import java.awt.event.ActionEvent;
@@ -36,7 +37,7 @@ public void show(
     }
     popup = null;
 
-    final JComponent colorPanel = new ColorPickerBuilder()
+    final LightCalloutPopup colorPanel = new ColorPickerBuilder()
       .setOriginalColor(initialColor != null ? initialColor : new Color(255, 255, 255))
       .addSaturationBrightnessComponent()
       .addColorAdjustPanel()
@@ -71,9 +72,10 @@ public void actionPerformed(ActionEvent e) {
           }
         }
       )
-      .addColorPickerListener((c, o) -> colorListener.colorChanged(c, null))
+
+      .addColorListener((c, o) -> colorListener.colorChanged(c, null))
       .build();
-    final BalloonBuilder balloonBuilder = JBPopupFactory.getInstance().createBalloonBuilder(colorPanel);
+    final BalloonBuilder balloonBuilder = JBPopupFactory.getInstance().createBalloonBuilder(colorPanel.getContent());
     balloonBuilder.setFadeoutTime(0);
     balloonBuilder.setAnimationCycle(0);
     balloonBuilder.setHideOnClickOutside(true);
@@ -83,7 +85,7 @@ public void actionPerformed(ActionEvent e) {
     balloonBuilder.setBlockClicksThroughBalloon(true);
     balloonBuilder.setRequestFocus(true);
     balloonBuilder.setShadow(true);
-    balloonBuilder.setFillColor(colorPanel.getBackground());
+    balloonBuilder.setFillColor(colorPanel.getContent().getBackground());
     popup = balloonBuilder.createBalloon();
     popup.show(new RelativePoint(component, offset), position);
   }
diff --git a/gradle.properties b/gradle.properties
index 609f75726a..e2f623f424 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,15 +1,14 @@
-name = "flutter-intellij"
-org.gradle.parallel=true
-org.gradle.jvmargs=-Xms1024m -Xmx4048m
-javaVersion=17
-androidVersion=X.Y.Z
-dartVersion=241.17502
-flutterPluginVersion=SNAPSHOT
-ide=android-studio
-testing=false
+name = "flutter-intellij
 buildSpec=2024.1
+flutterPluginVersion=1
+ideaProduct=android-studio
+ideaVersion=2024.1.2.10
 baseVersion=241.18034.62
-smaliPlugin=com.android.tools.idea.smali
-langPlugin=org.intellij.intelliLang
+dartPluginVersion=241.17502
+androidPluginVersion=
+sinceBuild=241
+untilBuild=241.*
+testing=true
 kotlin.stdlib.default.dependency=false
-ideVersion=2024.1.1.1
+org.gradle.parallel=true
+org.gradle.jvmargs=-Xms1024m -Xmx4048m
diff --git a/product-matrix.json b/product-matrix.json
index f3669b09c0..7ec6cad024 100644
--- a/product-matrix.json
+++ b/product-matrix.json
@@ -5,42 +5,60 @@
       "comments": "IntelliJ 2023.3, Android Studio Jellyfish 2023.3",
       "name": "2023.3",
       "version": "2023.3",
-      "isUnitTestTarget": "false",
+      "ijVersion": "2023.3",
       "ideaProduct": "android-studio",
       "ideaVersion": "2023.3.1.16",
       "baseVersion": "233.14808.21",
-      "androidPluginVersion": "X.Y.Z",
       "dartPluginVersion": "233.15271",
+      "androidPluginVersion": "",
       "sinceBuild": "233",
-      "untilBuild": "233.*"
+      "untilBuild": "233.*",
+      "isUnitTestTarget": "false"
     },
     {
       "channel": "stable",
       "comments": "IntelliJ 2024.1, Android Studio Koala 2024.1",
       "name": "2024.1",
       "version": "2024.1",
-      "isUnitTestTarget": "false",
+      "ijVersion": "2024.1",
       "ideaProduct": "android-studio",
-      "ideaVersion": "2024.1.1.1",
+      "ideaVersion": "2024.1.2.10",
       "baseVersion": "241.18034.62",
-      "androidPluginVersion": "X.Y.Z",
       "dartPluginVersion": "241.17502",
+      "androidPluginVersion": "",
       "sinceBuild": "241",
-      "untilBuild": "241.*"
+      "untilBuild": "241.*",
+      "isUnitTestTarget": "true"
     },
     {
       "channel": "stable",
       "comments": "IntelliJ 2024.2, Android Studio Ladybug 2024.2",
       "name": "2024.2",
       "version": "2024.2",
-      "isUnitTestTarget": "true",
+      "ijVersion": "2024.2",
       "ideaProduct": "android-studio",
-      "ideaVersion": "2024.1.1.1",
+      "ideaVersion": "2024.1.2.13",
       "baseVersion": "242.23339.11",
-      "androidPluginVersion": "X.Y.Z",
       "dartPluginVersion": "241.17502",
+      "androidPluginVersion": "",
       "sinceBuild": "242",
-      "untilBuild": "242.*"
+      "untilBuild": "242.*",
+      "isUnitTestTarget": "false"
+    },
+    {
+      "channel": "stable",
+      "comments": "IntelliJ 2024.3, IntelliJ 2024.3 EAP",
+      "name": "2024.3",
+      "version": "2024.3",
+      "ijVersion": "2024.3",
+      "ideaProduct": "IC",
+      "ideaVersion": "243.21565.23",
+      "baseVersion": "243.21565.23",
+      "dartPluginVersion": " 243.21565.120",
+      "androidPluginVersion": "243.21565.23",
+      "sinceBuild": "243",
+      "untilBuild": "253.*",
+      "isUnitTestTarget": "false"
     }
   ]
 }
\ No newline at end of file
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index 7ca0032f29..4e73758762 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -21,7 +21,7 @@
 
   <category>Custom Languages</category>
   <version>SNAPSHOT</version>
-  <idea-version since-build="242" until-build="242.*"/>
+  <idea-version since-build="241" until-build="241.*"/>
 
   <depends>com.intellij.modules.platform</depends>
   <depends>com.intellij.modules.lang</depends>
@@ -36,7 +36,6 @@
 
   <!-- Contributes IDEA-specific features and implementations. -->
   <depends optional="true" config-file="idea-contribs.xml">com.intellij.modules.java</depends>
-  <depends optional="true" config-file="flutter-coverage.xml">com.intellij.modules.coverage</depends>
 
   <!-- Contributes Android Studio-specific features and implementations. -->
   <!--suppress PluginXmlValidity -->
diff --git a/resources/META-INF/plugin_template.xml b/resources/META-INF/plugin_template.xml
index 31c0e2b9e3..ec71fc597a 100644
--- a/resources/META-INF/plugin_template.xml
+++ b/resources/META-INF/plugin_template.xml
@@ -34,7 +34,6 @@
 
   <!-- Contributes IDEA-specific features and implementations. -->
   <depends optional="true" config-file="idea-contribs.xml">com.intellij.modules.java</depends>
-  <depends optional="true" config-file="flutter-coverage.xml">com.intellij.modules.coverage</depends>
 
   <!-- Contributes Android Studio-specific features and implementations. -->
   <!--suppress PluginXmlValidity -->
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 31beabaad5..3043c06336 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,9 +11,9 @@ pluginManagement {
   }
 }
 
-val ide: String by settings
+val ideaProduct: String by settings
 
 include("flutter-idea")
-if (ide == "android-studio") {
+if (ideaProduct == "android-studio") {
   include("flutter-studio")
 }
diff --git a/tool/kokoro/build.sh b/tool/kokoro/build.sh
index 2b6b873adc..dae09308d8 100755
--- a/tool/kokoro/build.sh
+++ b/tool/kokoro/build.sh
@@ -5,8 +5,6 @@ setup
 
 echo "kokoro build start"
 
-./bin/plugin verify
-
 ./bin/plugin make --channel=dev
 
 echo "kokoro build finished"
diff --git a/tool/plugin/lib/build_spec.dart b/tool/plugin/lib/build_spec.dart
index 6e5c45a92e..167e57469b 100644
--- a/tool/plugin/lib/build_spec.dart
+++ b/tool/plugin/lib/build_spec.dart
@@ -10,7 +10,9 @@ import 'util.dart';
 
 class BuildSpec {
   // Build targets
+  // TODO (jwren) can we get rid of "name"
   final String name;
+  // TODO (jwren) these two can be consilidated
   final String version;
   final String? ijVersion;
   final bool isTestTarget;
@@ -19,6 +21,7 @@ class BuildSpec {
   final String ideaVersion;
   final String androidPluginVersion;
   final String dartPluginVersion;
+  // TODO (jwren) can baseVersion be removed?
   final String baseVersion;
 
   // plugin.xml variables
diff --git a/tool/plugin/lib/plugin.dart b/tool/plugin/lib/plugin.dart
index 93f9f921ab..ca6ac389b3 100644
--- a/tool/plugin/lib/plugin.dart
+++ b/tool/plugin/lib/plugin.dart
@@ -415,14 +415,7 @@ class GradleBuildCommand extends ProductCommand {
 
   Future<int> savePluginArtifact(BuildSpec spec) async {
     final file = File(releasesFilePath(spec));
-    final version = buildVersionNumber(spec);
-    var source = File('build/distributions/flutter-intellij-$version.zip');
-    if (!source.existsSync()) {
-      // Setting the plugin name in Gradle should eliminate the need for this,
-      // but it does not.
-      // TODO(messick) Find a way to make the Kokoro file name: flutter-intellij-DEV.zip
-      source = File('build/distributions/flutter-intellij-kokoro-$version.zip');
-    }
+    final source = File('build/distributions/flutter-intellij.zip');
     _copyFile(
       source,
       file.parent,
diff --git a/tool/plugin/lib/runner.dart b/tool/plugin/lib/runner.dart
index 0728ced645..d04ece8178 100644
--- a/tool/plugin/lib/runner.dart
+++ b/tool/plugin/lib/runner.dart
@@ -53,36 +53,21 @@ jxbrowser.license.key=$jxBrowserKey
     String version,
     String testing,
   ) async {
-    String javaVersion, smaliPlugin, langPlugin;
-    if (['2022.1', '2022.2'].contains(spec.version)) {
-      javaVersion = '11';
-      smaliPlugin = 'smali';
-      langPlugin = 'IntelliLang';
-    } else {
-      javaVersion = '17';
-      if (spec.version == '2022.2') {
-        smaliPlugin = 'smali';
-      } else {
-        smaliPlugin = 'com.android.tools.idea.smali';
-      }
-      langPlugin = 'org.intellij.intelliLang';
-    }
     final contents = '''
-name = "flutter-intellij"
-org.gradle.parallel=true
-org.gradle.jvmargs=-Xms1024m -Xmx4048m
-javaVersion=$javaVersion
-androidVersion=${spec.androidPluginVersion}
-dartVersion=${spec.dartPluginVersion}
-flutterPluginVersion=$version
-ide=${spec.ideaProduct}
-testing=$testing
+name = "flutter-intellij
 buildSpec=${spec.version}
+flutterPluginVersion=$version
+ideaProduct=${spec.ideaProduct}
+ideaVersion=${spec.ideaVersion}
 baseVersion=${spec.baseVersion}
-smaliPlugin=$smaliPlugin
-langPlugin=$langPlugin
+dartPluginVersion=${spec.dartPluginVersion}
+androidPluginVersion=${spec.androidPluginVersion}
+sinceBuild=${spec.sinceBuild}
+untilBuild=${spec.untilBuild}
+testing=$testing
 kotlin.stdlib.default.dependency=false
-ideVersion=${spec.ideaVersion}
+org.gradle.parallel=true
+org.gradle.jvmargs=-Xms1024m -Xmx4048m
 ''';
     final propertiesFile = File("$rootPath/gradle.properties");
     final source = propertiesFile.readAsStringSync();
diff --git a/tool/plugin/test/plugin_test.dart b/tool/plugin/test/plugin_test.dart
index 17dc737fa5..d430198814 100644
--- a/tool/plugin/test/plugin_test.dart
+++ b/tool/plugin/test/plugin_test.dart
@@ -37,7 +37,7 @@ void main() {
         expect(
             specs.map((spec) => spec.ideaProduct).toList(),
             orderedEquals(
-                ['android-studio', 'android-studio', 'android-studio']));
+                ['android-studio', 'android-studio', 'android-studio', 'IC']));
       });
     });
 
@@ -49,7 +49,7 @@ void main() {
         expect(
             specs.map((spec) => spec.ideaProduct).toList(),
             orderedEquals(
-                ['android-studio', 'android-studio', 'android-studio']));
+                ['android-studio', 'android-studio', 'android-studio', 'IC']));
       });
     });
 
@@ -61,7 +61,7 @@ void main() {
         expect(
             specs.map((spec) => spec.ideaProduct).toList(),
             orderedEquals(
-                ['android-studio', 'android-studio', 'android-studio']));
+                ['android-studio', 'android-studio', 'android-studio', 'IC']));
       });
     });
   });