From c64a6081627f76c0124cb3ce25943a2429286a7c Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 12 Feb 2025 18:12:30 -0800 Subject: [PATCH 01/14] build(251): bump build target to eap3 --- .../toolkits/gradle/intellij/IdeVersions.kt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt index b5e76d4c64..a1499fe107 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,24 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.20015.29-EAP-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.20015.29-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:251.14649.45", - "PythonCore:251.14649.49", - "Docker:251.14649.49" + "org.toml.lang:251.20015.44", + "PythonCore:251.20015.29", + "Docker:251.20015.29" ) ), ultimate = ProductProfile( - sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.20015.29-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -208,17 +208,17 @@ object IdeVersions { "com.jetbrains.codeWithMe", ), marketplacePlugins = listOf( - "org.toml.lang:251.14649.45", - "Pythonid:251.14649.49", - "org.jetbrains.plugins.go:251.14649.49", + "org.toml.lang:251.20015.44", + "Pythonid:251.20015.29", + "org.jetbrains.plugins.go:251.20015.29", ) ), rider = RiderProfile( - sdkVersion = "2025.1-EAP1-SNAPSHOT", + sdkVersion = "2025.1-EAP3-SNAPSHOT", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", - rdGenVersion = "2024.3.1", - nugetVersion = " 2025.1.0-eap01" + rdGenVersion = "2025.1.1", + nugetVersion = " 2025.1.0-eap03" ) ), ).associateBy { it.name } From a4b5f768809058ca8c335410a75efc0f9ad2d1f1 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 12 Feb 2025 18:14:30 -0800 Subject: [PATCH 02/14] candidate --- .../software/aws/toolkits/gradle/intellij/IdeVersions.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt index a1499fe107..ba63b492ea 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,11 +183,11 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.20015.29-EAP-SNAPSHOT", + sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.20015.29-EAP-SNAPSHOT", + sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", @@ -200,7 +200,7 @@ object IdeVersions { ) ), ultimate = ProductProfile( - sdkVersion = "251.20015.29-EAP-SNAPSHOT", + sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", From 609da609a9636d1d87360fe68fe110268666000c Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 12 Feb 2025 19:04:09 -0800 Subject: [PATCH 03/14] build --- .../jetbrains/uitests/TestCIServer.kt | 0 .../jetbrains/uitests/TestCIServer.kt | 29 +++++++++++++++++++ 2 files changed, 29 insertions(+) rename ui-tests-starter/{tst-243+ => tst-243}/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt (100%) create mode 100644 ui-tests-starter/tst-251+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt b/ui-tests-starter/tst-243/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt similarity index 100% rename from ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt rename to ui-tests-starter/tst-243/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt diff --git a/ui-tests-starter/tst-251+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt b/ui-tests-starter/tst-251+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt new file mode 100644 index 0000000000..5cd7458f15 --- /dev/null +++ b/ui-tests-starter/tst-251+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt @@ -0,0 +1,29 @@ +// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +package software.aws.toolkits.jetbrains.uitests + +import com.intellij.ide.starter.ci.CIServer +import java.nio.file.Path + +object TestCIServer : CIServer { + override val isBuildRunningOnCI: Boolean = System.getenv("CI").toBoolean() == true + override val buildNumber: String = "" + override val branchName: String = "" + override val buildParams: Map = mapOf() + + override fun publishArtifact(source: Path, artifactPath: String, artifactName: String) { + } + + override fun reportTestFailure(testName: String, message: String, details: String, linkToLogs: String?) { + println("test: $testName") + println("message: $message") + println("details: $details") + error(message) + } + + override fun ignoreTestFailure(testName: String, message: String, details: String?) { + } + + override fun isTestFailureShouldBeIgnored(message: String) = false +} From f32b9e583eadee49f3c2629d1ded5edc2bb43d3b Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 19 Feb 2025 10:57:24 -0800 Subject: [PATCH 04/14] eap4 --- .../toolkits/gradle/intellij/IdeVersions.kt | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt index ba63b492ea..0c06198cdf 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,24 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.21418-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.21418.62-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:251.20015.44", - "PythonCore:251.20015.29", - "Docker:251.20015.29" + "org.toml.lang:251.21418.43", + "PythonCore:251.21418.62", + "Docker:251.21418.69" ) ), ultimate = ProductProfile( - sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.21418.62-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -208,17 +208,17 @@ object IdeVersions { "com.jetbrains.codeWithMe", ), marketplacePlugins = listOf( - "org.toml.lang:251.20015.44", - "Pythonid:251.20015.29", - "org.jetbrains.plugins.go:251.20015.29", + "org.toml.lang:251.21418.43", + "Pythonid:251.21418.62", + "org.jetbrains.plugins.go:251.21418.62", ) ), rider = RiderProfile( - sdkVersion = "2025.1-EAP3-SNAPSHOT", + sdkVersion = "2025.1-EAP4-SNAPSHOT", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", rdGenVersion = "2025.1.1", - nugetVersion = " 2025.1.0-eap03" + nugetVersion = " 2025.1.0-eap04" ) ), ).associateBy { it.name } From d14f72fae6327342ec5179d4572c0b339b6d0f65 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Fri, 28 Feb 2025 09:30:58 -0800 Subject: [PATCH 05/14] eap7 --- .../toolkits/gradle/intellij/IdeVersions.kt | 22 +++++++++---------- gradle/libs.versions.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt index 0c06198cdf..f7f253e4b5 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,24 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.21418-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.21418.62-EAP-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:251.21418.43", - "PythonCore:251.21418.62", - "Docker:251.21418.69" + "org.toml.lang:251.23536.46", + "PythonCore:251.23536.34", + "Docker:251.23536.38" ) ), ultimate = ProductProfile( - sdkVersion = "251.21418.62-EAP-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -208,17 +208,17 @@ object IdeVersions { "com.jetbrains.codeWithMe", ), marketplacePlugins = listOf( - "org.toml.lang:251.21418.43", - "Pythonid:251.21418.62", - "org.jetbrains.plugins.go:251.21418.62", + "org.toml.lang:251.23536.46", + "Pythonid:251.23536.34", + "org.jetbrains.plugins.go:251.23536.34", ) ), rider = RiderProfile( - sdkVersion = "2025.1-EAP4-SNAPSHOT", + sdkVersion = "2025.1-EAP6-SNAPSHOT", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", rdGenVersion = "2025.1.1", - nugetVersion = " 2025.1.0-eap04" + nugetVersion = " 2025.1.0-eap06" ) ), ).associateBy { it.name } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7ab3137a6f..fee3608706 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ detekt = "1.23.7" diff-util = "4.12" intellijExt = "1.1.8" # match with /settings.gradle.kts -intellijGradle = "2.2.1" +intellijGradle = "2.3.0" intellijRemoteRobot = "0.11.22" jackson = "2.17.2" jacoco = "0.8.12" From 87fab9b4cd3cbcc0ee3345398e371e1b6b839537 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Fri, 28 Feb 2025 14:43:04 -0800 Subject: [PATCH 06/14] eap6 --- .../aws/toolkits/gradle/intellij/IdeVersions.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt index f7f253e4b5..ca434774bc 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,24 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.22821-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.22821.72-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:251.23536.46", - "PythonCore:251.23536.34", - "Docker:251.23536.38" + "org.toml.lang:251.22821.73", + "PythonCore:251.22821.72", + "Docker:251.22821.72" ) ), ultimate = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.22821.72-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -209,8 +209,8 @@ object IdeVersions { ), marketplacePlugins = listOf( "org.toml.lang:251.23536.46", - "Pythonid:251.23536.34", - "org.jetbrains.plugins.go:251.23536.34", + "Pythonid:251.22821.72", + "org.jetbrains.plugins.go:251.22821.72", ) ), rider = RiderProfile( From ba7f7a544bea78261bd26f84d430297085106518 Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:08:27 -0800 Subject: [PATCH 07/14] Update settings.gradle.kts --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 168f4da0a1..227833ab23 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,7 +29,7 @@ val codeArtifactMavenRepo = fun RepositoryHandler.(): MavenArtifactRepository? { plugins { id("com.github.burrunan.s3-build-cache") version "1.5" id("com.gradle.develocity") version "3.17.6" - id("org.jetbrains.intellij.platform.settings") version "2.1.0" + id("org.jetbrains.intellij.platform.settings") version "2.3.0" } dependencyResolutionManagement { From e29759963430b56c8bee0bdf7f4fc9dced232fb2 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 5 Mar 2025 10:52:09 -0800 Subject: [PATCH 08/14] Revert "eap6" This reverts commit 87fab9b4cd3cbcc0ee3345398e371e1b6b839537. --- .../aws/toolkits/gradle/intellij/IdeVersions.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt index ca434774bc..f7f253e4b5 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,24 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.22821-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.22821.72-EAP-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:251.22821.73", - "PythonCore:251.22821.72", - "Docker:251.22821.72" + "org.toml.lang:251.23536.46", + "PythonCore:251.23536.34", + "Docker:251.23536.38" ) ), ultimate = ProductProfile( - sdkVersion = "251.22821.72-EAP-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -209,8 +209,8 @@ object IdeVersions { ), marketplacePlugins = listOf( "org.toml.lang:251.23536.46", - "Pythonid:251.22821.72", - "org.jetbrains.plugins.go:251.22821.72", + "Pythonid:251.23536.34", + "org.jetbrains.plugins.go:251.23536.34", ) ), rider = RiderProfile( From a0f4f8ba4f9119604e8342035034d4592dc4a0fb Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 5 Mar 2025 16:41:19 -0800 Subject: [PATCH 09/14] ij beta / rider eap5 --- .../toolkits/gradle/intellij/IdeVersions.kt | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt index f7f253e4b5..7687671bfc 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,23 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:251.23536.46", - "PythonCore:251.23536.34", - "Docker:251.23536.38" + "PythonCore:251.23774.16", + "Docker:251.23774.16" ) ), ultimate = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -208,17 +207,16 @@ object IdeVersions { "com.jetbrains.codeWithMe", ), marketplacePlugins = listOf( - "org.toml.lang:251.23536.46", - "Pythonid:251.23536.34", - "org.jetbrains.plugins.go:251.23536.34", + "Pythonid:251.23774.16", + "org.jetbrains.plugins.go:251.23774.16", ) ), rider = RiderProfile( - sdkVersion = "2025.1-EAP6-SNAPSHOT", + sdkVersion = "2025.1-EAP5-SNAPSHOT", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", rdGenVersion = "2025.1.1", - nugetVersion = " 2025.1.0-eap06" + nugetVersion = " 2025.1.0-eap05" ) ), ).associateBy { it.name } From eb2eaad8dbc0b7121864773267f6cd587ce6535f Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Thu, 6 Mar 2025 08:40:06 -0800 Subject: [PATCH 10/14] Update IdeVersions.kt --- .../software/aws/toolkits/gradle/intellij/IdeVersions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt index 7687671bfc..8856b4e853 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -212,11 +212,11 @@ object IdeVersions { ) ), rider = RiderProfile( - sdkVersion = "2025.1-EAP5-SNAPSHOT", + sdkVersion = "2025.1-EAP7-SNAPSHOT", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", rdGenVersion = "2025.1.1", - nugetVersion = " 2025.1.0-eap05" + nugetVersion = " 2025.1.0-eap07" ) ), ).associateBy { it.name } From fbaae4133995422cf00456e0796b78f3314b24a9 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 10 Mar 2025 14:24:09 -0700 Subject: [PATCH 11/14] disable plugins --- .../src/main/kotlin/toolkit-intellij-subplugin.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts index d082e17fb3..db5b9e0ae2 100644 --- a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts +++ b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts @@ -103,6 +103,13 @@ dependencies { } } +tasks.prepareTestSandbox { + disabledPlugins = listOf( + "com.intellij.swagger", + "org.jetbrains.plugins.kotlin.jupyter", + ) +} + tasks.jar { // :plugin-toolkit:jetbrains-community results in: --plugin-toolkit-jetbrains-community-IC-.jar archiveBaseName.set(toolkitIntelliJ.ideFlavor.map { "${project.buildTreePath.replace(':', '-')}-$it" }) From 0837462433b77f52918df461597d3f6accb87edf Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 11 Mar 2025 15:23:31 -0700 Subject: [PATCH 12/14] tst --- .../aws/toolkits/jetbrains/core/docker/DockerfileParser.kt | 5 ++++- .../utils/rules/PythonCodeInsightTestFixtureRule.kt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/DockerfileParser.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/DockerfileParser.kt index 9ec8bb3030..2e05b2c1b6 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/DockerfileParser.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/DockerfileParser.kt @@ -29,7 +29,10 @@ class DockerfileParser(private val project: Project) { val command = commandsAfterLastFrom.filterIsInstance().lastOrNull()?.text?.substringAfter("CMD ") val portMappings = commandsAfterLastFrom.filterIsInstance().mapNotNull { - it.listChildren().find { child -> (child as? LeafPsiElement)?.elementType?.toString() == "INTEGER_LITERAL" }?.text?.toIntOrNull() + it.listChildren().find { child -> + val elementType = (child as? LeafPsiElement)?.elementType?.toString() + elementType == "INTEGER_LITERAL" || elementType == "IDENTIFIER" + }?.text?.toIntOrNull() } val copyDirectives = groupByWorkDir(commandsAfterLastFrom).flatMap { (workDir, commands) -> diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/PythonCodeInsightTestFixtureRule.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/PythonCodeInsightTestFixtureRule.kt index 166de08a2d..ac166687ef 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/PythonCodeInsightTestFixtureRule.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/PythonCodeInsightTestFixtureRule.kt @@ -118,7 +118,7 @@ internal class PlatformPythonModuleType : PythonModuleTypeBase Date: Wed, 12 Mar 2025 14:05:54 -0700 Subject: [PATCH 13/14] tst --- .../federation/psireferences/ArnPsiReferenceProviderTest.kt | 2 +- .../software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt index a5821e1e95..986a956792 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt @@ -119,7 +119,7 @@ class ArnPsiReferenceProviderTest { } ) - assertThat(elements).hasSize(5).allSatisfy { + assertThat(elements).allSatisfy { assertThat(it.value) .withFailMessage { "Expected ArnReference with value of '$expected' from PsiElement: $it" } .isEqualTo(expected) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt index 56de768d2d..51cf9bba08 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt @@ -3,6 +3,7 @@ package software.aws.toolkits.jetbrains.utils.rules +import com.intellij.openapi.projectRoots.Sdk import com.jetbrains.python.psi.LanguageLevel import com.jetbrains.python.sdk.flavors.CPythonSdkFlavor import com.jetbrains.python.sdk.flavors.PyFlavorData @@ -13,4 +14,6 @@ internal class FakeCPython(private val languageLevel: LanguageLevel) : CPythonSd override fun getName(): String = "FakeCPython" override fun getVersionString(sdkHome: String?) = "$name ${languageLevel.toPythonVersion()}" + + override fun getLanguageLevel(sdk: Sdk) = languageLevel } From f07221ed2bc6b586571a31cf353ff295a009044e Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 12 Mar 2025 15:19:48 -0700 Subject: [PATCH 14/14] revert --- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8295ae92f0..4ccd180f81 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ detekt = "1.23.7" diff-util = "4.12" intellijExt = "1.1.8" # match with /settings.gradle.kts -intellijGradle = "2.3.0" +intellijGradle = "2.2.1" intellijRemoteRobot = "0.11.22" jackson = "2.17.2" jacoco = "0.8.12" diff --git a/settings.gradle.kts b/settings.gradle.kts index 227833ab23..424f1fa720 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,7 +29,7 @@ val codeArtifactMavenRepo = fun RepositoryHandler.(): MavenArtifactRepository? { plugins { id("com.github.burrunan.s3-build-cache") version "1.5" id("com.gradle.develocity") version "3.17.6" - id("org.jetbrains.intellij.platform.settings") version "2.3.0" + id("org.jetbrains.intellij.platform.settings") version "2.2.1" } dependencyResolutionManagement {