Skip to content

Update Android Studio version #8565

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 2, 2025
Merged

Update Android Studio version #8565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70a92c5
Update Android Studio version and Dart version, disable gradle file f…
helin24 Sep 30, 2025
bcf447a
Remove conflicting src directories in test dependencies
helin24 Oct 1, 2025
2a7c50b
Update changelog
helin24 Oct 1, 2025
ed7981f
Add log message if gradle build file method used
helin24 Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 1 addition & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,7 @@ sourceSets {
test {
java.srcDirs(
listOf(
"src",
"testSrc/unit",
"third_party/vmServiceDrivers"
"testSrc/unit"
)
)
resources.srcDirs(
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 13 additions & 4 deletions src/io/flutter/utils/AndroidLocationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,33 @@
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;

// 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) {
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.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks for inlining this context!


//GradleModuleModel moduleModel = GradleProjectSystemUtil.getGradleModuleModel(module);
//if (moduleModel != null) {
// return moduleModel.getBuildFile();
//}
LOG.info("getGradleBuildFile attempted for module " + module.getName() + " but will return null");
return null;
}

Expand Down