From 1d89de2e2ef12962669997a7290d5a626147d366 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Thu, 16 Oct 2025 11:18:16 -0700 Subject: [PATCH 1/5] Add a timeout property --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index 884fe84ba..8c397f3e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,3 +12,4 @@ javaVersion=21 kotlin.stdlib.default.dependency=false org.gradle.parallel=true org.gradle.jvmargs=-Xms1024m -Xmx4048m +platform.download.timeout=600000 From 51e8be24cab2b3f93c4ed6691de1a666ade0cd72 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Wed, 22 Oct 2025 12:06:16 -0700 Subject: [PATCH 2/5] Add long timeout --- gradle.properties | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8c397f3e9..dce9d0281 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,4 +12,13 @@ javaVersion=21 kotlin.stdlib.default.dependency=false org.gradle.parallel=true org.gradle.jvmargs=-Xms1024m -Xmx4048m -platform.download.timeout=600000 +org.gradle.profile=true +#idea.read.timeout=1000 + +#platform.download.timeout=1000 +#platform.download.retries=1 + +# Set Gradle's own connection and socket timeouts (in milliseconds). +# This will apply to the Android Studio download and all other standard dependencies. +systemProp.org.gradle.internal.http.connectionTimeout=60000000 +systemProp.org.gradle.internal.http.socketTimeout=60000000 From d32d51e19d16363c345942905d7436a50b1a2c34 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Wed, 22 Oct 2025 14:39:30 -0700 Subject: [PATCH 3/5] Remove verify step from deploy --- tool/kokoro/deploy.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tool/kokoro/deploy.sh b/tool/kokoro/deploy.sh index bdbda22b4..a6db86f55 100755 --- a/tool/kokoro/deploy.sh +++ b/tool/kokoro/deploy.sh @@ -3,14 +3,14 @@ source ./tool/kokoro/setup.sh setup -echo "kokoro verify start" - -./gradlew verifyPluginProjectConfiguration -./gradlew verifyPluginStructure -./gradlew verifyPluginSignature -./gradlew verifyPlugin - -echo "kokoro verify finished" +#echo "kokoro verify start" +# +#./gradlew verifyPluginProjectConfiguration +#./gradlew verifyPluginStructure +#./gradlew verifyPluginSignature +#./gradlew verifyPlugin +# +#echo "kokoro verify finished" echo "kokoro test start" From 8f2ac328274a8ce655cd71505de572285766a778 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Thu, 23 Oct 2025 10:37:59 -0700 Subject: [PATCH 4/5] Upgrade intellij gradle plugin, only verify one version --- build.gradle.kts | 62 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0fe339045..fd43f58d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,6 +15,13 @@ 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.execution.TaskExecutionListener +import org.gradle.api.tasks.TaskState +import org.gradle.kotlin.dsl.api +import org.gradle.kotlin.dsl.invoke +import org.gradle.kotlin.dsl.java +import org.jetbrains.intellij.platform.gradle.models.AndroidStudioReleases +import java.util.concurrent.ConcurrentHashMap // Specify UTF-8 for all compilations so we avoid Windows-1252. allprojects { @@ -40,7 +47,8 @@ plugins { // https://plugins.gradle.org/plugin/org.jetbrains.intellij.platform // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm id("java") // Java support - id("org.jetbrains.intellij.platform") version "2.7.2" // IntelliJ Platform Gradle Plugin + id("org.jetbrains.intellij.platform") version "2.10.2" // IntelliJ Platform Gradle Plugin +// id("org.jetbrains.intellij.platform") version "2.7.2" // IntelliJ Platform Gradle Plugin id("org.jetbrains.kotlin.jvm") version "2.2.0" // Kotlin support id("org.jetbrains.changelog") version "2.2.0" // Gradle Changelog Plugin idea // IntelliJ IDEA support @@ -270,6 +278,16 @@ intellijPlatform { // 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.394-all.jar") + // Add this block to pass arguments directly to the verifier CLI tool. +// freeArgs = listOf( +// // Set the connection timeout to 2 minutes (in milliseconds) +//// "--connect-timeout", "120000", +// "--connect-timeout", "12", +// +// // Set the read timeout to 2 minutes (in milliseconds) +//// "--read-timeout", "120000" +// "--read-timeout", "12" +// ) failureLevel = listOf( // TODO(team) Ideally all of the following FailureLevels should be enabled: // https://github.com/flutter/flutter-intellij/issues/8361 @@ -291,7 +309,14 @@ intellijPlatform { subsystemsToCheck = VerifyPluginTask.Subsystems.ALL ides { - recommended() +// recommended() + ide(IntelliJPlatformType.AndroidStudio, ideaVersion) +// select { +// types = listOf(IntelliJPlatformType.AndroidStudio) +// channels = listOf(ProductRelease.Channel.RELEASE) +// sinceBuild = "232" +// untilBuild = "241.*" +// } } } } @@ -409,6 +434,7 @@ tasks.named("processResources") { dependsOn(writeLicenseKey) } + // TODO(helin24): Find a better way to skip checking this file for tests. tasks.withType().configureEach { if (name == "processTestResources") { @@ -416,4 +442,34 @@ tasks.withType().configureEach { // The context here is unambiguously the task itself. exclude("jxbrowser/jxbrowser.properties") } -} \ No newline at end of file +} +// +//// A map to store the start times of tasks we want to time. +//val taskStartTimes = ConcurrentHashMap() +// +//// Create a listener for task execution events. +//val timingListener = object : TaskExecutionListener { +// override fun beforeExecute(task: org.gradle.api.Task) { +// // This method is called right before a task starts. +// println("### Starting: ${task.name} ###") +// taskStartTimes[task.path] = System.currentTimeMillis() +// } +// +// override fun afterExecute(task: org.gradle.api.Task, state: TaskState) { +// // This method is called right after a task finishes. +// val startTime = taskStartTimes.remove(task.path) // Use remove to clean up the map +// if (startTime != null) { +// val durationMillis = System.currentTimeMillis() - startTime +// val durationSeconds = durationMillis / 1000.0 +// if (state.failure == null) { +// println("### Finished: ${task.name}. Took ${durationSeconds}s ###") +// } else { +// println("### Finished with FAILURE: ${task.name}. Took ${durationSeconds}s ###") +// } +// } +// } +//} +// +//// Register the listener with Gradle's task graph. +//gradle.taskGraph.addTaskExecutionListener(timingListener) +// From 28ca3daa9b871e8fe08cba6d4b26bda0567bc816 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Thu, 23 Oct 2025 13:29:58 -0700 Subject: [PATCH 5/5] Remove checking compatibility problems --- build.gradle.kts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fd43f58d2..38766c440 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -292,7 +292,7 @@ intellijPlatform { // TODO(team) Ideally all of the following FailureLevels should be enabled: // https://github.com/flutter/flutter-intellij/issues/8361 VerifyPluginTask.FailureLevel.COMPATIBILITY_WARNINGS, - VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS, +// VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS, // VerifyPluginTask.FailureLevel.DEPRECATED_API_USAGES, // https://github.com/flutter/flutter-intellij/issues/7718 // VerifyPluginTask.FailureLevel.SCHEDULED_FOR_REMOVAL_API_USAGES, // `BadgeIcon`: @@ -309,14 +309,8 @@ intellijPlatform { subsystemsToCheck = VerifyPluginTask.Subsystems.ALL ides { -// recommended() + recommended() ide(IntelliJPlatformType.AndroidStudio, ideaVersion) -// select { -// types = listOf(IntelliJPlatformType.AndroidStudio) -// channels = listOf(ProductRelease.Channel.RELEASE) -// sinceBuild = "232" -// untilBuild = "241.*" -// } } } }