Merge branch 'main' into dependabot/gradle/org.jetbrains.kotlinx.kover-0.9.8

Author: pq

.gemini/styleguide.md

@@ -74,4 +74,5 @@ enforce standard modern Java/Kotlin coding conventions, but strictly police the
 - **DRY:** Identify blocks of code that are 90%+ identical to existing utility methods in this repo and flag them for duplication.
 - **Meaningful Naming:** Variables should describe their intent (e.g., `timeoutInMs` instead of `t`).
 - **Descriptive Pull Request:** Contributors should include the information recommended in the pull request template (In
-  `.github/PULL_REQUEST_TEMPLATE.md`Ï)
+  `.github/PULL_REQUEST_TEMPLATE.md`Ï)
+- **Changelog Entries:** Enforce that there is a changelog entry for all user-facing changes. Entries must strictly match the existing grammatical style using descriptive, state-based phrases (typically starting with gerunds, nouns, or verbs like *Avoid* / *Support* / *Log* / *Prevent*) rather than starting with the imperative verb *Fix* or *Add*.

.github/workflows/update_flutter.yaml

@@ -0,0 +1,61 @@
+# Copyright 2026 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.
+
+name: Update Flutter SDK Pin
+
+on:
+  schedule:
+    - cron: '0 0 * * 1' # Run every Monday at midnight UTC
+  workflow_dispatch: # Allow manual execution from the Actions tab
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  check-and-update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Check for New Flutter stable version
+        id: check-version
+        run: |
+          # 1. Retrieve the current pinned version from the shared script
+          CURRENT_VERSION=$(grep -E 'FLUTTER_VERSION="[0-9.]+"' tool/provision_flutter.sh | head -n 1 | cut -d'"' -f2)
+          echo "Current pinned version: $CURRENT_VERSION"
+
+          # 2. Retrieve the latest stable version from Flutter's official releases manifest
+          LATEST_VERSION=$(curl -s https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json | jq -r '.releases | map(select(.channel == "stable"))[0].version')
+          echo "Latest stable version: $LATEST_VERSION"
+
+          # 3. Compare and update if a newer version is available
+          if [ "$CURRENT_VERSION" != "$LATEST_VERSION" ]; then
+            echo "New Flutter stable version detected: $LATEST_VERSION"
+            sed -i -e "s/FLUTTER_VERSION=\"$CURRENT_VERSION\"/FLUTTER_VERSION=\"$LATEST_VERSION\"/g" tool/provision_flutter.sh
+            echo "updated=true" >> $GITHUB_OUTPUT
+            echo "latest_version=$LATEST_VERSION" >> $GITHUB_OUTPUT
+          else
+            echo "Flutter SDK is already up to date."
+            echo "updated=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create Pull Request for Version Bump
+        if: steps.check-version.outputs.updated == 'true'
+        uses: peter-evans/create-pull-request@v6
+        with:
+          commit-message: "ci: bump pinned Flutter SDK to version ${{ steps.check-version.outputs.latest_version }}"
+          title: "ci: bump pinned Flutter SDK to version ${{ steps.check-version.outputs.latest_version }}"
+          body: |
+            An automated check has detected a new stable release of the Flutter SDK.
+            
+            * **New Pinned Version**: `${{ steps.check-version.outputs.latest_version }}`
+            
+            This Pull Request updates our shared provisioning script (`tool/provision_flutter.sh`) to target this version. All presubmit tests will be run against this version to verify compatibility.
+          branch: "auto-update-flutter-sdk"
+          delete-branch: true
+          labels: |
+            dependencies
+            ci

AUTHORS

@@ -28,3 +28,5 @@ Japnit Singh <truejswalia@gmail.com>
 Dmitry Kandalov <dmitry.kandalov@gmail.com>
 Kazuya Chikamatsu <kazu.chika.shima@gmail.com>
 Dustin Feucht <code.nopjar@gmail.com>
+Nico Mexis <nicomexis.nm@gmail.com>
+Luke Memet <lukememet@gmail.com>

CHANGELOG.md

@@ -2,11 +2,14 @@
 
 ### Added
 
+- Missing platforms and targets to Build menu.
+
 ### Changed
 
 ### Removed
 
 ### Fixed
+- Restored device labels on split-debugger run tabs in IntelliJ IDEA 2025.3+. (#8908)
 
 ## 92.0.0
 

build.gradle.kts

@@ -15,6 +15,10 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
+import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
 
 // Specify UTF-8 for all compilations so we avoid Windows-1252.
 allprojects {
@@ -50,27 +54,40 @@ plugins {
 // By default (e.g. when we call `runIde` during development), the plugin version is SNAPSHOT
 var flutterPluginVersion = "SNAPSHOT"
 
+val isRelease = providers.gradleProperty("release").isPresent
+val isDev = providers.gradleProperty("dev").isPresent
+val singleIdeVersionProvider = providers.gradleProperty("singleIdeVersion")
+
 // Otherwise, we will decide on the proper semver-formatted version from the CHANGELOG.
 // Note: The CHANGELOG follows the style from https://keepachangelog.com/en/1.0.0/ so that we can use the gradle changelog plugin.
-if (project.hasProperty("release")) {
+if (isRelease) {
   // If we are building for a release, the changelog should be updated with the latest version.
   flutterPluginVersion = changelog.getLatest().version
-} else if (project.hasProperty("dev")) {
+} else if (isDev) {
   // If we are building the dev version, the version label will increment the latest version from the changelog and append the date.
   val latestVersion = changelog.getLatest().version
   val majorVersion = latestVersion.substringBefore('.').toInt()
   val nextMajorVersion = majorVersion + 1
   val datestamp = DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDate.now())
   flutterPluginVersion = "$nextMajorVersion.0.0-dev.$datestamp"
 
-  val commitHash = System.getenv("KOKORO_GIT_COMMIT")
-  if (commitHash is String) {
+  val commitHash = System.getenv("KOKORO_GIT_COMMIT") ?: try {
+    providers.exec {
+      commandLine("git", "rev-parse", "--short", "HEAD")
+    }.standardOutput.asText.get().trim()
+  } catch (e: Exception) {
+    // Catching all exceptions here is intentional: if git is not installed, or if this is built
+    // outside of a git repository clone (e.g. from a source zip release), we want the build
+    // to gracefully proceed with an empty hash instead of crashing.
+    ""
+  }
+  if (commitHash.isNotEmpty()) {
     val shortCommitHash = commitHash.take(7)
     flutterPluginVersion += "-$shortCommitHash"
   }
 }
 
-val ideaVersion = providers.gradleProperty("ideaVersion").get()
+val androidStudioVersion = providers.gradleProperty("androidStudioVersion").get()
 val dartPluginVersion = providers.gradleProperty("dartPluginVersion").get()
 val sinceBuildInput = providers.gradleProperty("sinceBuild").get()
 val untilBuildInput = providers.gradleProperty("untilBuild").get()
@@ -79,7 +96,7 @@ group = "io.flutter"
 
 // For debugging purposes:
 println("flutterPluginVersion: $flutterPluginVersion")
-println("ideaVersion: $ideaVersion")
+println("androidStudioVersion: $androidStudioVersion")
 println("dartPluginVersion: $dartPluginVersion")
 println("sinceBuild: $sinceBuildInput")
 println("untilBuild: $untilBuildInput")
@@ -97,7 +114,7 @@ jvmVersion = when (javaVersion) {
   }
 
   else -> {
-    throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
+    throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $androidStudioVersion")
   }
 }
 
@@ -125,7 +142,7 @@ javaCompatibilityVersion = when (javaVersion) {
   }
 
   else -> {
-    throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
+    throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $androidStudioVersion")
   }
 }
 
@@ -202,7 +219,7 @@ dependencies {
     // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#default-target-platforms
     // Android Studio versions can be found at: https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
     try {
-      androidStudio(ideaVersion)
+      androidStudio(androidStudioVersion)
     } catch (e: Exception) {
       throw GradleException(
         "Failed to resolve Android Studio / IDEA download URL. This is likely due to a network issue blocking the download URL. Please check your internet connection or VPN.",
@@ -225,17 +242,16 @@ dependencies {
         "org.jetbrains.kotlin",
         "org.jetbrains.plugins.gradle",
         "org.jetbrains.plugins.yaml",
-        "org.intellij.intelliLang",
         "org.jetbrains.android",
         "com.android.tools.idea.smali"
       )
     )
     plugin("Dart:$dartPluginVersion")
+    plugin("com.redhat.devtools.lsp4ij:${libs.versions.lsp4ij.get()}")
+    bundledModule("intellij.platform.langInjection")
 
-    if (sinceBuildInput == "243" || sinceBuildInput == "251") {
-      bundledModule("intellij.platform.coverage")
-      bundledModule("intellij.platform.coverage.agent")
-    }
+    bundledModule("intellij.platform.coverage")
+    bundledModule("intellij.platform.coverage.agent")
     pluginVerifier()
   }
 
@@ -246,6 +262,7 @@ dependencies {
   testImplementation(libs.guava.jre)
   testImplementation(libs.gson)
   testImplementation(libs.junit)
+  testImplementation(libs.bytebuddy)
   implementation(
     fileTree(
       mapOf(
@@ -305,8 +322,8 @@ intellijPlatform {
 
     ides {
       // `singleIdeVersion` is only intended for use by GitHub actions to enable deleting instances of IDEs after testing.
-      if (project.hasProperty("singleIdeVersion")) {
-        val singleIdeVersion = project.property("singleIdeVersion") as String
+      if (singleIdeVersionProvider.isPresent) {
+        val singleIdeVersion = singleIdeVersionProvider.get()
         select {
           types = listOf(IntelliJPlatformType.AndroidStudio)
           channels = listOf(ProductRelease.Channel.RELEASE)
@@ -322,7 +339,7 @@ intellijPlatform {
 
 // If we don't delete old versions of the IDE during `verifyPlugin`, then GitHub action bots can run out of space.
 tasks.withType<VerifyPluginTask> {
-  if (project.hasProperty("singleIdeVersion")) {
+  if (singleIdeVersionProvider.isPresent) {
     doLast {
       ides.forEach { ide ->
         if (ide.exists()) {
@@ -435,7 +452,7 @@ intellijPlatformTesting {
         "Ultimate" -> IntelliJPlatformType.IntellijIdeaUltimate
         else -> IntelliJPlatformType.AndroidStudio
       }
-      this.version = version ?: ideaVersion
+      this.version = version ?: androidStudioVersion
     }
   }
 }
@@ -523,3 +540,17 @@ tasks.withType<ProcessResources>().configureEach {
     exclude("jxbrowser/jxbrowser.properties")
   }
 }
+
+abstract class PrintVersionTask : DefaultTask() {
+  @get:Input
+  abstract val pluginVersion: Property<String>
+
+  @TaskAction
+  fun action() {
+    println(pluginVersion.get())
+  }
+}
+
+tasks.register<PrintVersionTask>("printVersion") {
+  pluginVersion.set(intellijPlatform.pluginConfiguration.version)
+}

gradle.properties

@@ -4,8 +4,10 @@
 # found in the LICENSE file.
 #
 
-ideaVersion=2025.2.3.9
-dartPluginVersion= 504.0.0
+# We try to use the stable Android Studio version here since most Flutter users are on Android Studio and not IntelliJ.
+# Meanwhile, Dart-only users are more likely to be on IntelliJ.
+androidStudioVersion=2025.3.4.6
+dartPluginVersion= 505.0.0
 # Also update the versions for verify checks in tool/github.sh.
 sinceBuild=251
 untilBuild=261.*

gradle/libs.versions.toml

@@ -6,16 +6,18 @@
 jetbrains-annotations = "26.1.0"
 guava-android = "33.6.0-android"
 guava-jre = "33.6.0-android"
-gson = "2.10.1"
+gson = "2.14.0"
 junit = "4.13.2"
 kodein-di = "7.26.1"
-kotlinx-coroutines = "1.9.0"
+kotlinx-coroutines = "1.10.2"
 junit-jupiter = "6.0.3"
 junit-platform = "6.0.3"
-intellij-platform-plugin = "2.12.0"
+intellij-platform-plugin = "2.16.0"
 kotlin = "2.2.0"
 changelog = "2.5.0"
 kover = "0.9.8"
+lsp4ij="0.19.3"
+bytebuddy = "1.14.11"
 
 [libraries]
 jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
@@ -27,6 +29,7 @@ kodein-di = { group = "org.kodein.di", name = "kodein-di-jvm", version.ref = "ko
 kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit-jupiter" }
 junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junit-platform" }
+bytebuddy = { group = "net.bytebuddy", name = "byte-buddy", version.ref = "bytebuddy" }
 
 [plugins]
 intellij-platform = { id = "org.jetbrains.intellij.platform", version.ref = "intellij-platform-plugin" }

resources/META-INF/plugin.xml

@@ -163,11 +163,19 @@
         <!--suppress PluginXmlCapitalization -->
         <action id="flutter.build.aab" text="Build App Bundle" description="Building a Flutter app for Google Play Store distribution"
                 class="io.flutter.actions.FlutterBuildActionGroup$AppBundle"/>
+        <action id="flutter.build.bundle" text="Build Assets Bundle" description="Building the Flutter assets directory"
+                class="io.flutter.actions.FlutterBuildActionGroup$Bundle"/>
         <!--suppress PluginXmlCapitalization -->
         <action id="flutter.build.ios" text="Build iOS" description="Building a Flutter app for Apple App Store distribution"
                 class="io.flutter.actions.FlutterBuildActionGroup$Ios"/>
+        <action id="flutter.build.linux" text="Build Linux" description="Building a Flutter app for Linux"
+                class="io.flutter.actions.FlutterBuildActionGroup$Linux"/>
+        <action id="flutter.build.macos" text="Build macOS" description="Building a Flutter app for macOS"
+                class="io.flutter.actions.FlutterBuildActionGroup$Macos"/>
         <action id="flutter.build.web" text="Build Web" description="Building a Flutter app for web"
                 class="io.flutter.actions.FlutterBuildActionGroup$Web"/>
+        <action id="flutter.build.windows" text="Build Windows" description="Building a Flutter app for Windows"
+                class="io.flutter.actions.FlutterBuildActionGroup$Windows"/>
       </group>
       <add-to-group group-id="BuildMenu" anchor="first"/>
     </group>

settings.gradle.kts

@@ -3,10 +3,6 @@
  * 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()
-  }
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }