From 70a92c560ebbf26caa2c7f44acd6f3883921756d Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Tue, 30 Sep 2025 10:58:22 -0700 Subject: [PATCH 1/4] Update Android Studio version and Dart version, disable gradle file finding --- gradle.properties | 4 ++-- src/io/flutter/utils/AndroidLocationProvider.java | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 53ebd2ce0a..610437a57f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ # found in the LICENSE file. # -ideaVersion=2025.1.3.4 -dartPluginVersion= 251.27623.5 +ideaVersion=2025.2.1.3 +dartPluginVersion= 252.25557.23 sinceBuild=243 untilBuild=253.* javaVersion=21 diff --git a/src/io/flutter/utils/AndroidLocationProvider.java b/src/io/flutter/utils/AndroidLocationProvider.java index ce064d0fd9..0d6949a717 100644 --- a/src/io/flutter/utils/AndroidLocationProvider.java +++ b/src/io/flutter/utils/AndroidLocationProvider.java @@ -23,10 +23,14 @@ public class AndroidLocationProvider implements BuildModelContext.ResolvedConfig @Nullable @Override public VirtualFile getGradleBuildFile(@NotNull Module module) { - GradleModuleModel moduleModel = GradleProjectSystemUtil.getGradleModuleModel(module); - if (moduleModel != null) { - return moduleModel.getBuildFile(); - } + // TODO(helin24): Delete this code (and potentially related code) if commenting out has no negative impact on Android editing. + // I believe this is to make gradle files show up nicely when a flutter project is opened, but this functionality already does not work + // and is not needed if we are recommending users edit Android files in a separate project window. + + //GradleModuleModel moduleModel = GradleProjectSystemUtil.getGradleModuleModel(module); + //if (moduleModel != null) { + // return moduleModel.getBuildFile(); + //} return null; } From bcf447ad4c7b290408c3346292d87d78ee5bc520 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Tue, 30 Sep 2025 19:10:29 -0700 Subject: [PATCH 2/4] Remove conflicting src directories in test dependencies --- build.gradle.kts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c44945d0a6..0fe3390450 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -152,9 +152,7 @@ sourceSets { test { java.srcDirs( listOf( - "src", - "testSrc/unit", - "third_party/vmServiceDrivers" + "testSrc/unit" ) ) resources.srcDirs( From 2a7c50b2b9d1e5ded9592ac72fe725a50c4a6746 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Wed, 1 Oct 2025 09:05:33 -0700 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f5c470a4a..8321aff7f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ -## Unreleased +## 88.0.0 ### Added +- Support for Android Studio 2025.2 + ### Removed - The Flutter version is now read from the file ./bin/cache/flutter.version.json, required in Flutter 3.33+ (#8465) From ed7981f0d68950945c4982db7837883d1b23dfd8 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Thu, 2 Oct 2025 10:44:17 -0700 Subject: [PATCH 4/4] Add log message if gradle build file method used --- src/io/flutter/utils/AndroidLocationProvider.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/io/flutter/utils/AndroidLocationProvider.java b/src/io/flutter/utils/AndroidLocationProvider.java index 0d6949a717..70de2099a7 100644 --- a/src/io/flutter/utils/AndroidLocationProvider.java +++ b/src/io/flutter/utils/AndroidLocationProvider.java @@ -9,10 +9,12 @@ import com.android.tools.idea.gradle.project.model.GradleModuleModel; import com.android.tools.idea.gradle.util.GradleProjectSystemUtil; import com.android.tools.idea.projectsystem.AndroidProjectRootUtil; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectUtil; import com.intellij.openapi.vfs.VirtualFile; +import io.flutter.logging.PluginLogger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.SystemIndependent; @@ -20,6 +22,8 @@ // Copied from GradleModelSource.ResolvedConfigurationFileLocationProviderImpl // This file must be ignored in pre-4.1 builds. public class AndroidLocationProvider implements BuildModelContext.ResolvedConfigurationFileLocationProvider { + final static private Logger LOG = PluginLogger.createLogger(AndroidLocationProvider.class); + @Nullable @Override public VirtualFile getGradleBuildFile(@NotNull Module module) { @@ -31,6 +35,7 @@ public VirtualFile getGradleBuildFile(@NotNull Module module) { //if (moduleModel != null) { // return moduleModel.getBuildFile(); //} + LOG.info("getGradleBuildFile attempted for module " + module.getName() + " but will return null"); return null; }