Skip to content

Upgrade version of Android Studio #8946

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
auto-submit merged 9 commits into from
May 5, 2026
Merged

Upgrade version of Android Studio #8946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
13324dc
Update Dart plugin dependency
helin24 May 4, 2026
ec19e17
Use higher version of Android Studio
helin24 May 4, 2026
59be858
Add 253, 261 to verification
helin24 May 4, 2026
56ce547
Update dependencies to fix tests
helin24 May 4, 2026
b5768b2
Remove 261 and update baselines
helin24 May 4, 2026
005c7e4
Ignore different param names during verify
helin24 May 4, 2026
e12e1c4
Add java 21 resolver and try removing other settings
helin24 May 5, 2026
0a86d4d
Remove commented out code and unnecessary condition
helin24 May 5, 2026
4e2d3fd
Change var name to note Android Studio, add clarifying comment
helin24 May 5, 2026
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
22 changes: 11 additions & 11 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ if (project.hasProperty("release")) {
}
}

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()
Expand All @@ -79,7 +79,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")
Expand All @@ -97,7 +97,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")
}
}

Expand Down Expand Up @@ -125,7 +125,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")
}
}

Expand Down Expand Up @@ -202,7 +202,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.",
Expand All @@ -225,17 +225,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") {
Comment thread
pq marked this conversation as resolved.
bundledModule("intellij.platform.coverage")
bundledModule("intellij.platform.coverage.agent")
}
bundledModule("intellij.platform.coverage")
bundledModule("intellij.platform.coverage.agent")
pluginVerifier()
}

Expand All @@ -246,6 +245,7 @@ dependencies {
testImplementation(libs.guava.jre)
testImplementation(libs.gson)
testImplementation(libs.junit)
testImplementation(libs.bytebuddy)
implementation(
fileTree(
mapOf(
Expand Down Expand Up @@ -435,7 +435,7 @@ intellijPlatformTesting {
"Ultimate" -> IntelliJPlatformType.IntellijIdeaUltimate
else -> IntelliJPlatformType.AndroidStudio
}
this.version = version ?: ideaVersion
this.version = version ?: androidStudioVersion
}
}
}
Expand Down
6 changes: 4 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,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.*
Expand Down
5 changes: 4 additions & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ kodein-di = "7.26.1"
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.4"
lsp4ij="0.19.3"
bytebuddy = "1.14.11"

[libraries]
jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
Expand All @@ -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" }
Comment thread
helin24 marked this conversation as resolved.

[plugins]
intellij-platform = { id = "org.jetbrains.intellij.platform", version.ref = "intellij-platform-plugin" }
Expand Down
8 changes: 2 additions & 6 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment thread
pq marked this conversation as resolved.
}
3 changes: 1 addition & 2 deletions tool/baseline/251/verifier-baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@
* Deprecated constructor com.intellij.ui.LayeredIcon.<init>(javax.swing.Icon[] icons) is invoked in io.flutter.toolwindow.ToolWindowBadgeUpdater.lambda$updateBadgedIcon$0(ToolWindow) : void
* Deprecated constructor com.intellij.ui.LayeredIcon.<init>(javax.swing.Icon[] icons) is invoked in io.flutter.toolwindow.ToolWindowBadgeUpdater.lambda$updateBadgedIcon$1(ToolWindow) : void
* Deprecated constructor com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters.<init>() is invoked in io.flutter.run.SdkRunConfig.writeExternal(Element) : void
* Deprecated constructor com.jetbrains.lang.dart.ide.template.DartTemplateContextType.<init>(java.lang.String arg0, java.lang.String arg1, java.lang.Class arg2) is invoked in io.flutter.template.DartToplevelTemplateContextType.<init>()
* Deprecated constructor com.jetbrains.lang.dart.ide.template.DartTemplateContextType.<init>(java.lang.String id, java.lang.String presentableName, java.lang.Class baseContextType) is invoked in io.flutter.template.DartToplevelTemplateContextType.<init>()
* Deprecated interface com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider is referenced in io.flutter.template.FlutterLiveTemplatesProvider
* Deprecated method com.intellij.coverage.CoverageEngine.createCoverageSuite(com.intellij.coverage.CoverageRunner arg0, java.lang.String arg1, com.intellij.coverage.CoverageFileProvider arg2, com.intellij.execution.configurations.coverage.CoverageEnabledConfiguration arg3) : com.intellij.coverage.CoverageSuite is overridden in class io.flutter.run.coverage.FlutterCoverageEngine
* Deprecated method com.intellij.coverage.CoverageEngine.createCoverageSuite(com.intellij.coverage.CoverageRunner arg0, java.lang.String arg1, com.intellij.coverage.CoverageFileProvider arg2, java.lang.String[] arg3, long arg4, java.lang.String arg5, boolean arg6, boolean arg7, boolean arg8, com.intellij.openapi.project.Project arg9) : com.intellij.coverage.CoverageSuite is overridden in class io.flutter.run.coverage.FlutterCoverageEngine
* Deprecated method com.intellij.coverage.CoverageRunner.loadCoverageData(java.io.File sessionDataFile, com.intellij.coverage.CoverageSuite baseCoverageSuite) : com.intellij.rt.coverage.data.ProjectData is overridden in class io.flutter.run.coverage.FlutterCoverageRunner
* Deprecated method com.intellij.ide.util.PropertiesComponent.setValues(java.lang.String arg0, java.lang.String[] arg1) : void is invoked in io.flutter.sdk.FlutterSdkUtil.updateKnownPaths(String, String) : void
* Deprecated method com.intellij.openapi.actionSystem.ActionPlaces.isMainMenuOrActionSearch(java.lang.String place) : boolean is invoked in io.flutter.run.FlutterPopFrameAction.update(AnActionEvent) : void
* Deprecated method com.intellij.openapi.application.Application.addApplicationListener(com.intellij.openapi.application.ApplicationListener arg0) : void is invoked in io.flutter.jxbrowser.EmbeddedBrowserEngine.<init>()
* Deprecated method com.intellij.openapi.project.DumbService.runReadActionInSmartMode(com.intellij.openapi.util.Computable r) : T is invoked in io.flutter.font.FontPreviewProcessor.analyzeNextClass(Project, FontPreviewProcessor.WorkItem) : void
* Deprecated method com.intellij.openapi.project.DumbService.runReadActionInSmartMode(com.intellij.openapi.util.Computable r) : T is invoked in io.flutter.font.FontPreviewProcessor.analyzeNextFile(Project, FontPreviewProcessor.WorkItem) : void
* Deprecated method com.intellij.openapi.project.DumbService.runReadActionInSmartMode(com.intellij.openapi.util.Computable r) : T is invoked in io.flutter.font.FontPreviewProcessor.findFontFiles(Project, String, FontPreviewProcessor.WorkItem) : void
Expand Down
Loading
Loading