Merge branch 'feature/coreDeprecation' into breedloj/coreShadowJar

Author: breedloj

.changes/3.98.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-11-14",
+  "version" : "3.98",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Add support for 2025.3"
+  }, {
+    "type" : "deprecation",
+    "description" : "An upcoming release will remove support for JetBrains Gateway version 2025.2 and for IDEs based on the 2024.3 platform"
+  } ]
+}

.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.3', '2025.1', '2025.2' ]
+        version: [ '2024.3', '2025.1', '2025.2', '2025.3' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

CHANGELOG.md

@@ -1,3 +1,7 @@
+# _3.98_ (2025-11-14)
+- **(Feature)** Add support for 2025.3
+- **(Deprecation)** An upcoming release will remove support for JetBrains Gateway version 2025.2 and for IDEs based on the 2024.3 platform
+
 # _3.97_ (2025-10-16)
 
 # _3.96_ (2025-10-02)

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt

@@ -29,7 +29,7 @@ fun Project.jvmTarget(): Provider<JavaVersion> = withCurrentProfileName {
 fun Project.kotlinTarget(): Provider<String> = withCurrentProfileName {
     when (it) {
         "2024.3" -> KotlinVersionEnum.KOTLIN_2_0
-        "2025.1", "2025.2" -> KotlinVersionEnum.KOTLIN_2_1
+        "2025.1", "2025.2", "2025.3" -> KotlinVersionEnum.KOTLIN_2_1
         else -> error("not set")
     }.version
 }

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -34,7 +34,6 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
-                    "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
                     "org.toml.lang:243.21565.122",
@@ -74,7 +73,6 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
-                    "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
                     "org.toml.lang:251.26927.47",
@@ -121,7 +119,6 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
-                    "com.jetbrains.codeWithMe",
                     "com.intellij.properties"
                 ),
                 marketplacePlugins = listOf(
@@ -152,6 +149,49 @@ object IdeVersions {
                 rdGenVersion = "2025.2.2",
                 nugetVersion = "2025.2.0"
             )
+        ),
+        Profile(
+            name = "2025.3",
+            gateway = ProductProfile(
+                sdkVersion = "253.28086.53",
+                bundledPlugins = listOf("org.jetbrains.plugins.terminal")
+            ),
+            community = ProductProfile(
+                sdkVersion = "253.28294-EAP-CANDIDATE-SNAPSHOT",
+                bundledPlugins = commonPlugins + listOf(
+                    "com.intellij.java",
+                    "com.intellij.gradle",
+                    "org.jetbrains.idea.maven",
+                    "com.intellij.properties"
+                ),
+                marketplacePlugins = listOf(
+                    "org.toml.lang:253.28294.86",
+                    "PythonCore:253.28294.51",
+                    "Docker:253.28294.90",
+                    "com.intellij.modules.json:253.28294.51"
+                )
+            ),
+            ultimate = ProductProfile(
+                sdkVersion = "253.28294-EAP-CANDIDATE-SNAPSHOT",
+                bundledPlugins = commonPlugins + listOf(
+                    "JavaScript",
+                    "JavaScriptDebugger",
+                    "com.intellij.database",
+                    "com.jetbrains.codeWithMe"
+                ),
+                marketplacePlugins = listOf(
+                    "Pythonid:253.28294.51",
+                    "org.jetbrains.plugins.go:253.28294.51",
+                    "com.intellij.modules.json:253.28294.51"
+                )
+            ),
+            rider = RiderProfile(
+                sdkVersion = "2025.3-SNAPSHOT",
+                bundledPlugins = commonPlugins,
+                netFrameworkTarget = "net472",
+                rdGenVersion = "2025.3.1",
+                nugetVersion = "2025.3.0"
+            )
         )
     ).associateBy { it.name }
 

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -101,6 +101,14 @@ dependencies {
         bundledPlugins(toolkitIntelliJ.productProfile().map { it.bundledPlugins })
         plugins(toolkitIntelliJ.productProfile().map { it.marketplacePlugins })
 
+        // OAuth modules split in 2025.3 (253) - must be explicitly bundled
+        val versionStr = version.get()
+        if (versionStr.contains("253")) {
+            bundledModule("intellij.platform.collaborationTools")
+            bundledModule("intellij.platform.collaborationTools.auth.base")
+            bundledModule("intellij.platform.collaborationTools.auth")
+        }
+
         testFramework(TestFrameworkType.Plugin.Java)
         testFramework(TestFrameworkType.Platform)
         testFramework(TestFrameworkType.JUnit5)

gradle.properties

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.98-SNAPSHOT
+toolkitVersion=3.99-SNAPSHOT
 
 # Publish Settings
 publishToken=

kotlinResolution.settings.gradle.kts

@@ -10,7 +10,7 @@ dependencyResolutionManagement {
                     "1.8.0-intellij-11"
                 }
 
-                "2025.2" -> {
+                "2025.2", "2025.3" -> {
                     "1.10.1-intellij-5"
                 }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

@@ -232,7 +232,11 @@ class BrowserConnector(
             SEND_CHAT_COMMAND_PROMPT -> {
                 val requestFromUi = serializer.deserializeChatMessages<SendChatPromptRequest>(node)
                 val editor = FileEditorManager.getInstance(project).selectedTextEditor
-                val textDocumentIdentifier = editor?.let { TextDocumentIdentifier(toUriString(it.virtualFile)) }
+                val textDocumentIdentifier = editor?.let { e ->
+                    e.virtualFile?.let {
+                        TextDocumentIdentifier(toUriString(it))
+                    }
+                }
                 val cursorState = editor?.let { LspEditorUtil.getCursorState(it) }
 
                 val enrichmentParams = mapOf(
@@ -362,7 +366,11 @@ class BrowserConnector(
 
             CHAT_INSERT_TO_CURSOR -> {
                 val editor = FileEditorManager.getInstance(project).selectedTextEditor
-                val textDocumentIdentifier = editor?.let { TextDocumentIdentifier(toUriString(it.virtualFile)) }
+                val textDocumentIdentifier = editor?.let { e ->
+                    e.virtualFile?.let {
+                        TextDocumentIdentifier(toUriString(it))
+                    }
+                }
                 val cursorPosition = editor?.let { LspEditorUtil.getCursorPosition(it) }
 
                 val enrichmentParams = mapOf(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/util/LanguageExtractor.kt

@@ -10,6 +10,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmi
 class LanguageExtractor {
     fun extractLanguageNameFromCurrentFile(editor: Editor): String =
         runReadAction {
-            editor.virtualFile.programmingLanguage().languageId
+            editor.virtualFile?.programmingLanguage()?.languageId ?: "plaintext"
         }
 }