From fafe2bdcbaac06fcb770e5030f8a6debf6b0d7a4 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 10 Sep 2025 18:27:05 -0700 Subject: [PATCH 1/2] build: drop support for 242 --- ...-33b6e109-ecfc-4771-a6fc-e7363dc39c1c.json | 4 ++ .github/workflows/prerelease.yml | 2 +- ...n AWS Toolkit - Community [2024.2].run.xml | 25 ----------- ...Run AWS Toolkit - Gateway [2025.1].run.xml | 25 ----------- .run/Run AWS Toolkit - Rider [2024.2].run.xml | 25 ----------- ...un AWS Toolkit - Ultimate [2024.2].run.xml | 25 ----------- .run/Run All - Community [2024.2].run.xml | 25 ----------- .run/Run All - Rider [2024.2].run.xml | 25 ----------- .run/Run All - Ultimate [2024.2].run.xml | 25 ----------- .../Run Amazon Q - Community [2024.2].run.xml | 25 ----------- .run/Run Amazon Q - Rider [2024.2].run.xml | 25 ----------- .run/Run Amazon Q - Ultimate [2024.2].run.xml | 25 ----------- .run/generateConfigs.py | 2 +- .../aws/toolkits/gradle/BuildScriptUtils.kt | 1 - .../toolkits/gradle/intellij/IdeVersions.kt | 42 ------------------- kotlinResolution.settings.gradle.kts | 4 -- .../toolkit/jetbrains-rider/build.gradle.kts | 2 +- settings.gradle.kts | 8 +--- 18 files changed, 8 insertions(+), 307 deletions(-) create mode 100644 .changes/next-release/removal-33b6e109-ecfc-4771-a6fc-e7363dc39c1c.json delete mode 100644 .run/Run AWS Toolkit - Community [2024.2].run.xml delete mode 100644 .run/Run AWS Toolkit - Gateway [2025.1].run.xml delete mode 100644 .run/Run AWS Toolkit - Rider [2024.2].run.xml delete mode 100644 .run/Run AWS Toolkit - Ultimate [2024.2].run.xml delete mode 100644 .run/Run All - Community [2024.2].run.xml delete mode 100644 .run/Run All - Rider [2024.2].run.xml delete mode 100644 .run/Run All - Ultimate [2024.2].run.xml delete mode 100644 .run/Run Amazon Q - Community [2024.2].run.xml delete mode 100644 .run/Run Amazon Q - Rider [2024.2].run.xml delete mode 100644 .run/Run Amazon Q - Ultimate [2024.2].run.xml diff --git a/.changes/next-release/removal-33b6e109-ecfc-4771-a6fc-e7363dc39c1c.json b/.changes/next-release/removal-33b6e109-ecfc-4771-a6fc-e7363dc39c1c.json new file mode 100644 index 00000000000..9437d627d01 --- /dev/null +++ b/.changes/next-release/removal-33b6e109-ecfc-4771-a6fc-e7363dc39c1c.json @@ -0,0 +1,4 @@ +{ + "type" : "removal", + "description" : "Removed support for 2024.2.x IDEs and Gateway 2025.1" +} \ No newline at end of file diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 5c2ecba505c..be13e07f52a 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: build_target: [ ':plugin-core:buildPlugin', ':plugin-toolkit:intellij-standalone:buildPlugin', ':plugin-amazonq:buildPlugin' ] - version: [ '2024.2', '2024.3', '2025.1', '2025.2' ] + version: [ '2024.3', '2025.1', '2025.2' ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.run/Run AWS Toolkit - Community [2024.2].run.xml b/.run/Run AWS Toolkit - Community [2024.2].run.xml deleted file mode 100644 index 903ba959561..00000000000 --- a/.run/Run AWS Toolkit - Community [2024.2].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run AWS Toolkit - Gateway [2025.1].run.xml b/.run/Run AWS Toolkit - Gateway [2025.1].run.xml deleted file mode 100644 index 144e9186cdf..00000000000 --- a/.run/Run AWS Toolkit - Gateway [2025.1].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run AWS Toolkit - Rider [2024.2].run.xml b/.run/Run AWS Toolkit - Rider [2024.2].run.xml deleted file mode 100644 index 8e8401917eb..00000000000 --- a/.run/Run AWS Toolkit - Rider [2024.2].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run AWS Toolkit - Ultimate [2024.2].run.xml b/.run/Run AWS Toolkit - Ultimate [2024.2].run.xml deleted file mode 100644 index a817e351620..00000000000 --- a/.run/Run AWS Toolkit - Ultimate [2024.2].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run All - Community [2024.2].run.xml b/.run/Run All - Community [2024.2].run.xml deleted file mode 100644 index 4f0ad7b5cb7..00000000000 --- a/.run/Run All - Community [2024.2].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run All - Rider [2024.2].run.xml b/.run/Run All - Rider [2024.2].run.xml deleted file mode 100644 index da3ca2d6242..00000000000 --- a/.run/Run All - Rider [2024.2].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run All - Ultimate [2024.2].run.xml b/.run/Run All - Ultimate [2024.2].run.xml deleted file mode 100644 index be0eca8b099..00000000000 --- a/.run/Run All - Ultimate [2024.2].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run Amazon Q - Community [2024.2].run.xml b/.run/Run Amazon Q - Community [2024.2].run.xml deleted file mode 100644 index a6938fa06f2..00000000000 --- a/.run/Run Amazon Q - Community [2024.2].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run Amazon Q - Rider [2024.2].run.xml b/.run/Run Amazon Q - Rider [2024.2].run.xml deleted file mode 100644 index 6bdbf3e79e3..00000000000 --- a/.run/Run Amazon Q - Rider [2024.2].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run Amazon Q - Ultimate [2024.2].run.xml b/.run/Run Amazon Q - Ultimate [2024.2].run.xml deleted file mode 100644 index f0d00383c8a..00000000000 --- a/.run/Run Amazon Q - Ultimate [2024.2].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/generateConfigs.py b/.run/generateConfigs.py index b18583c0d62..95952370dc0 100644 --- a/.run/generateConfigs.py +++ b/.run/generateConfigs.py @@ -52,7 +52,7 @@ def write_config(mv: str, ide: IdeVariant, plugin: PluginVariant): f.write(TEMPLATE.format(plugin = plugin, variant = ide, major_version = mv)) if __name__ == '__main__': - mvs = ["2024.2", "2024.3", "2025.1", "2025.2"] + mvs = ["2024.3", "2025.1", "2025.2"] ides = [ IdeVariant("Community", "IC"), IdeVariant("Rider", "RD"), diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt index a21655bc4c9..8432d3e20cc 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt @@ -28,7 +28,6 @@ fun Project.jvmTarget(): Provider = withCurrentProfileName { // https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#stdlib-miscellaneous fun Project.kotlinTarget(): Provider = withCurrentProfileName { when (it) { - "2024.2" -> KotlinVersionEnum.KOTLIN_1_9 "2024.3" -> KotlinVersionEnum.KOTLIN_2_0 "2025.1", "2025.2" -> KotlinVersionEnum.KOTLIN_2_1 else -> error("not set") 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 338a7a246fe..0fd34e946d6 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 @@ -26,44 +26,6 @@ object IdeVersions { ) private val ideProfiles = listOf( - Profile( - name = "2024.2", - community = ProductProfile( - sdkVersion = "2024.2", - bundledPlugins = commonPlugins + listOf( - "com.intellij.java", - "com.intellij.gradle", - "org.jetbrains.idea.maven", - "com.jetbrains.codeWithMe", - ), - marketplacePlugins = listOf( - "org.toml.lang:242.20224.155", - "PythonCore:242.20224.300", - "Docker:242.20224.237" - ) - ), - ultimate = ProductProfile( - sdkVersion = "2024.2", - bundledPlugins = commonPlugins + listOf( - "JavaScript", - "JavaScriptDebugger", - "com.intellij.database", - "com.jetbrains.codeWithMe", - ), - marketplacePlugins = listOf( - "org.toml.lang:242.20224.155", - "PythonCore:242.20224.300", - "org.jetbrains.plugins.go:242.20224.300", - ) - ), - rider = RiderProfile( - sdkVersion = "2024.2", - bundledPlugins = commonPlugins, - netFrameworkTarget = "net472", - rdGenVersion = "2024.1.1", - nugetVersion = " 2024.2.0" - ) - ), Profile( name = "2024.3", community = ProductProfile( @@ -106,10 +68,6 @@ object IdeVersions { ), Profile( name = "2025.1", - gateway = ProductProfile( - sdkVersion = "2025.1", - bundledPlugins = listOf("org.jetbrains.plugins.terminal") - ), community = ProductProfile( sdkVersion = "2025.1", bundledPlugins = commonPlugins + listOf( diff --git a/kotlinResolution.settings.gradle.kts b/kotlinResolution.settings.gradle.kts index 5078b59a6de..ccc4ee9d06f 100644 --- a/kotlinResolution.settings.gradle.kts +++ b/kotlinResolution.settings.gradle.kts @@ -6,10 +6,6 @@ dependencyResolutionManagement { maybeCreate("libs").apply { // pull value from IJ library list: https://github.com/JetBrains/intellij-community/blob//.idea/libraries/kotlinx_coroutines_core.xml val version = when (providers.gradleProperty("ideProfileName").getOrNull() ?: return@apply) { - "2024.2" -> { - "1.8.0-intellij-9" - } - "2024.3", "2025.1" -> { "1.8.0-intellij-11" } diff --git a/plugins/toolkit/jetbrains-rider/build.gradle.kts b/plugins/toolkit/jetbrains-rider/build.gradle.kts index 989b3b31d71..6e624db252c 100644 --- a/plugins/toolkit/jetbrains-rider/build.gradle.kts +++ b/plugins/toolkit/jetbrains-rider/build.gradle.kts @@ -80,7 +80,7 @@ dependencies { // FIX_WHEN_MIN_IS_251: https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1774 when (providers.gradleProperty("ideProfileName").get()) { - "2024.2", "2024.3", "2025.1" -> { + "2024.3", "2025.1" -> { bundledModule("intellij.rider") } } diff --git a/settings.gradle.kts b/settings.gradle.kts index d54755d69d3..10b2dc37d56 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -117,12 +117,6 @@ include("detekt-rules") include("ui-tests") include("sandbox-all") include("ui-tests-starter") -when (providers.gradleProperty("ideProfileName").get()) { - // FIX_WHEN_MIN_IS_243 - "2024.2" -> { - project(":ui-tests-starter").projectDir = file("noop") - } -} /* plugins/ @@ -176,7 +170,7 @@ file("plugins").listFiles()?.forEach root@ { if (it.name == "jetbrains-gateway") { when (providers.gradleProperty("ideProfileName").get()) { // buildSrc is evaluated after settings so we can't key off of IdeVersions.kt - "2024.2", "2024.3" -> { + "2024.3" -> { return@forEach } } From 924f9def13b225e57664b6e58da176b94708f624 Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Thu, 11 Sep 2025 11:38:21 -0700 Subject: [PATCH 2/2] Update supported IDE versions in 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 10b2dc37d56..fb12737451f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -170,7 +170,7 @@ file("plugins").listFiles()?.forEach root@ { if (it.name == "jetbrains-gateway") { when (providers.gradleProperty("ideProfileName").get()) { // buildSrc is evaluated after settings so we can't key off of IdeVersions.kt - "2024.3" -> { + "2024.3", "2025.1" -> { return@forEach } }