Merge branch 'flutter:master' into feat/optional-android-dep

Author: AlexV525

.github/workflows/presubmit.yaml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [2023.3, 2024.1, 2024.2, 2024.3]
+        version: [2024.1, 2024.2, 2024.3, 2025.1]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

.idea/inspectionProfiles/Project_Default.xml

@@ -1,11 +1,18 @@
-# 84
-- Fix the slow operation notification associated with PubRoot (#7885)
+# 85
+- Restored Test with coverage run configuration feature (#7810)
+- Upgrade `org.jetbrains.intellij.platform` to 2.2.1 from 2.1.0 (#7936)
+- Fix for DevTool windows not appearing (#8029)
+- Support for Narwhal, Android Studio 2025.1 (#7963)
+- Build changes to support newer required versions of Java to build the plugin (#7963)
 - Cleanup: removal of pre Dart SDK 3.0 code (#7882)
 - Cleanup: removal of the deprecated Swing-based Inspector window (#7861)
 - Cleanup: removal of the deprecated Outline window (#7816)
 - Cleanup: removal of the deprecated Performance page window (#7816)
 - Migrated all instances of EditorNotifications.Provider to the new API (#7830)
 
+# 84
+- This version was not shipped due to issue #7968
+
 # 83
 - First version for Meerkat, Android Studio 2024.3 (#7799)
 - Message in the Flutter Outline window that the window is now deprecated (#7778)

CHANGELOG.md

@@ -14,7 +14,6 @@ Contributing to Flutter Plugin for IntelliJ
   * [Adding platform sources](#adding-platform-sources)
   * [Working with Android Studio](#working-with-android-studio)
   * [Working with Embedded DevTools (JxBrowser)](#working-with-embedded-devtools-jxbrowser)
-  * [Signing commits](#signing-commits)
 <!-- TOC -->
 
 ## Contributing code
@@ -116,7 +115,7 @@ name and contact info to the [AUTHORS](AUTHORS) file.
    - In the root directory, create an empty `gradle.properties` file (`touch gradle.properties`)
    - Add the following to the file:
    ```
-    name = "flutter-intellij
+    name = "flutter-intellij"
     buildSpec=2024.3
     flutterPluginVersion=1
     ideaProduct=android-studio
@@ -129,7 +128,7 @@ name and contact info to the [AUTHORS](AUTHORS) file.
     testing=true
     kotlin.stdlib.default.dependency=false
     org.gradle.parallel=true
-    org.gradle.jvmargs=-Xms1024m -Xmx4048m`
+    org.gradle.jvmargs=-Xms1024m -Xmx4048m
     ```
     - **[Note]** If you want, you can manually change these properties to target different versions of IntelliJ. See `product-matrix.json` to find which configurations are supported.
 
@@ -380,7 +379,9 @@ Obviously, unit tests can only be run from the command line.
    then adjust it to point to `flutter-intellij/third_party/lib/dart-plugin/xxx.yyyy/Dart.jar`.
    Delete the Dart module from the Project Structure modules list.
 
-## Working with Embedded DevTools (JxBrowser)
+## Flutter DevTools Integration
+
+### Working with Embedded DevTools (JxBrowser)
 
 We use [JxBrowser](https://www.teamdev.com/jxbrowser),
 a commercial product, to embed DevTools within IntelliJ.
@@ -399,3 +400,17 @@ To set up the license key:
 1. Copy the template at resources/jxbrowser/jxbrowser.properties.template
    and save it as resources/jxbrowser/jxbrowser.properties.
 2. Replace `<KEY>` with the actual key.
+
+### Developing with local DevTools
+
+By default, the DevTools version in IntelliJ will match the DevTools version shipped with Flutter. To instead use a local DevTools version (which will be launched with `dt serve`), the following steps are required:
+
+1. Make sure you have `dt` installed
+    - Follow instructions in the [DevTools set-up guide](https://github.com/flutter/devtools/blob/master/CONTRIBUTING.md#set-up-your-devtools-environment)
+2. Set the registry key to your DevTools directory
+    - Go to Help > Find action > Registry > Find "flutter.local.devtools.dir" and set to your DevTools directory. (e.g. Users/user/dev/devtools)
+    - Optional: If you want to pass additional arguments to `dt serve`, put these in the option "flutter.local.devtools.args"
+3. Restart IntelliJ
+4. Open Help > Show log in finder > Open idea.log
+    - Verify you see output like see output `"DevTools startup: <various messages that come from running dt serve>"`
+5. To stop using local DevTools, go back to the registry key set in step 2 and remove it

CONTRIBUTING.md

@@ -32,11 +32,11 @@ plugins {
   // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html
   // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
   // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
-  // TODO(jwren) "2.2.0" can't be used to build 2023.3, as soon as we don't support this version, update the version here and elsewhere:
-  id("org.jetbrains.intellij.platform") version "2.1.0"
-  id("org.jetbrains.kotlin.jvm") version "2.1.0"
+  id("org.jetbrains.intellij.platform") version "2.5.0"
+  id("org.jetbrains.kotlin.jvm") version "2.1.20"
 }
 
+// TODO(mossmana) These properties are duplicated in flutter-idea/build.gradle.kts and flutter-studio/build.gradle.kts. Should be consolidated.
 val flutterPluginVersion = providers.gradleProperty("flutterPluginVersion").get()
 val ideaProduct = providers.gradleProperty("ideaProduct").get()
 val ideaVersion = providers.gradleProperty("ideaVersion").get()
@@ -45,6 +45,7 @@ val dartPluginVersion = providers.gradleProperty("dartPluginVersion").get()
 val androidPluginVersion = providers.gradleProperty("androidPluginVersion").get()
 val sinceBuildInput = providers.gradleProperty("sinceBuild").get()
 val untilBuildInput = providers.gradleProperty("untilBuild").get()
+val javaVersion = providers.gradleProperty("javaVersion").get()
 group = "io.flutter"
 
 // For debugging purposes:
@@ -55,32 +56,49 @@ println("dartPluginVersion: $dartPluginVersion")
 println("androidPluginVersion: $androidPluginVersion")
 println("sinceBuild: $sinceBuildInput")
 println("untilBuild: $untilBuildInput")
+println("javaVersion: $javaVersion")
 println("group: $group")
 
+var jvmVersion: JvmTarget
+if (javaVersion == "17") {
+  jvmVersion = JvmTarget.JVM_17
+} else if (javaVersion == "21") {
+  jvmVersion = JvmTarget.JVM_21
+} else {
+  throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
+}
 kotlin {
   compilerOptions {
     apiVersion.set(KotlinVersion.KOTLIN_1_9)
-    jvmTarget = JvmTarget.JVM_17
+    jvmTarget = jvmVersion
   }
 }
-val javaCompatibilityVersion = JavaVersion.VERSION_17
+
+var javaCompatibilityVersion: JavaVersion
+if (javaVersion == "17") {
+  javaCompatibilityVersion = JavaVersion.VERSION_17
+} else if (javaVersion == "21") {
+  javaCompatibilityVersion = JavaVersion.VERSION_21
+} else {
+  throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
+}
 java {
   sourceCompatibility = javaCompatibilityVersion
   targetCompatibility = javaCompatibilityVersion
 }
 
 dependencies {
   intellijPlatform {
-    // Documentation on the create(...) methods:
-    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#custom-target-platforms
+    // Documentation on the default target platform methods:
+    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#default-target-platforms
     if (ideaProduct == "android-studio") {
-      create(IntelliJPlatformType.AndroidStudio, ideaVersion)
-    } else {//if (ide == "ideaIC") {
-      create(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+      androidStudio(ideaVersion)
+    } else { // if (ideaProduct == "IC") {
+      intellijIdeaCommunity(ideaVersion)
     }
     testFramework(TestFrameworkType.Platform)
 
-    // Plugin dependnecy documentation:
+    // Plugin dependency documentation:
     // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#plugins
     val bundledPluginList = mutableListOf(
       "com.intellij.java",
@@ -89,8 +107,7 @@ dependencies {
       "Git4Idea",
       "org.jetbrains.kotlin",
       "org.jetbrains.plugins.gradle",
-      "org.intellij.intelliLang",
-    )
+      "org.intellij.intelliLang")
     if (ideaProduct == "android-studio") {
       bundledPluginList.add("org.jetbrains.android")
       bundledPluginList.add("com.android.tools.idea.smali")
@@ -105,12 +122,10 @@ dependencies {
     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 (sinceBuildInput == "243" || sinceBuildInput == "251") {
+      bundledModule("intellij.platform.coverage")
+      bundledModule("intellij.platform.coverage.agent")
+    }
     pluginVerifier()
   }
 }
@@ -123,54 +138,6 @@ intellijPlatform {
       untilBuild = untilBuildInput
     }
   }
-
-  // Verifier documentation
-  // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html#intellijPlatform-pluginVerification
-  // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html#intellijPlatform-pluginVerification-ides
-  pluginVerification {
-    // https://github.com/JetBrains/intellij-plugin-verifier/?tab=readme-ov-file#specific-options
-    // https://github.com/JetBrains/intellij-plugin-verifier
-    cliPath = file("../third_party/lib/verifier-cli-1.381-all.jar")
-    failureLevel = listOf(
-      // TODO(team) Ideally all of the following FailureLevels should be enabled:
-      // TODO(team) Create a tracking issue for each of the following validations
-//      VerifyPluginTask.FailureLevel.COMPATIBILITY_WARNINGS,
-//      VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS,
-//      VerifyPluginTask.FailureLevel.DEPRECATED_API_USAGES,
-//      VerifyPluginTask.FailureLevel.SCHEDULED_FOR_REMOVAL_API_USAGES,
-      VerifyPluginTask.FailureLevel.EXPERIMENTAL_API_USAGES,
-//      VerifyPluginTask.FailureLevel.INTERNAL_API_USAGES,
-//      VerifyPluginTask.FailureLevel.OVERRIDE_ONLY_API_USAGES,
-      VerifyPluginTask.FailureLevel.NON_EXTENDABLE_API_USAGES,
-      VerifyPluginTask.FailureLevel.PLUGIN_STRUCTURE_WARNINGS,
-//      VerifyPluginTask.FailureLevel.MISSING_DEPENDENCIES,
-      VerifyPluginTask.FailureLevel.INVALID_PLUGIN,
-//      VerifyPluginTask.FailureLevel.NOT_DYNAMIC,
-    )
-    verificationReportsFormats = VerifyPluginTask.VerificationReportsFormats.ALL
-    subsystemsToCheck = VerifyPluginTask.Subsystems.ALL
-    // Mute and freeArgs documentation
-    // https://github.com/JetBrains/intellij-plugin-verifier/?tab=readme-ov-file#specific-options
-    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#mutePluginVerifierProblems
-    freeArgs = listOf(
-      "-mute",
-      "TemplateWordInPluginId,ForbiddenPluginIdPrefix,TemplateWordInPluginName"
-    )
-    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:

build.gradle.kts

@@ -8,7 +8,7 @@ Update the [product-matrix.json](../product-matrix.json):
 - IntelliJ IDEA versions can be found here: https://www.jetbrains.com/idea/download/other.html
   - Version numbers for the `product-matrix.json` should be taken from the name of the downloaded file, not versions listed on the website.
 - Dart Plugin versions can be found here: https://plugins.jetbrains.com/plugin/6351-dart
-- Android Studio versions can be found here: https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
+- Android Studio versions can be found here: https://developer.android.com/studio/archive & https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
   - To view the current sources from Android Studio, use https://cs.android.com/android-studio
 - To get versions of the Android plugin for IntelliJ, versions can be pulled from https://plugins.jetbrains.com/plugin/22989-android