fix gradle plugin wrong version

Author: rli

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

@@ -173,11 +173,11 @@ object IdeVersions {
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2025.2-EAP6-SNAPSHOT",
+                sdkVersion = "2025.2-EAP8-SNAPSHOT",
                 bundledPlugins = commonPlugins,
                 netFrameworkTarget = "net472",
                 rdGenVersion = "2025.2.2",
-                nugetVersion = "2025.2.0-eap06"
+                nugetVersion = "2025.2.0-eap08"
             )
         )
     ).associateBy { it.name }

buildSrc/src/main/kotlin/temp-toolkit-intellij-root-conventions.gradle.kts

@@ -23,10 +23,10 @@ plugins {
     id("toolkit-publish-root-conventions")
 }
 
-toolkitIntelliJ.apply {
-    val runIdeVariant = providers.gradleProperty("runIdeVariant")
-    ideFlavor.set(IdeFlavor.values().firstOrNull { it.name == runIdeVariant.orNull } ?: IdeFlavor.IC)
-}
+//toolkitIntelliJ.apply {
+//    val runIdeVariant = providers.gradleProperty("runIdeVariant")
+//    ideFlavor.set(IdeFlavor.values().firstOrNull { it.name == runIdeVariant.orNull } ?: IdeFlavor.IC)
+//}
 
 val remoteRobotPort: String by project
 val ideProfile = IdeVersions.ideProfile(project)
@@ -66,12 +66,12 @@ tasks.test {
 }
 
 dependencies {
-    intellijPlatform {
-        val type = toolkitIntelliJ.ideFlavor.map { IntelliJPlatformType.fromCode(it.toString()) }
-        val version = toolkitIntelliJ.version()
-
-        create(type, version, useInstaller = false)
-    }
+//    intellijPlatform {
+//        val type = toolkitIntelliJ.ideFlavor.map { IntelliJPlatformType.fromCode(it.toString()) }
+//        val version = toolkitIntelliJ.version()
+//
+//        create(type, version, useInstaller = false)
+//    }
 
     implementation(project(":plugin-toolkit:jetbrains-ultimate"))
     project.findProject(":plugin-toolkit:jetbrains-gateway")?.let {

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

@@ -2,9 +2,28 @@
 // SPDX-License-Identifier: Apache-2.0
 import org.jetbrains.intellij.platform.gradle.tasks.aware.SandboxAware
 import software.aws.toolkits.gradle.ciOnly
+import software.aws.toolkits.gradle.intellij.IdeFlavor
 import software.aws.toolkits.gradle.intellij.ToolkitIntelliJExtension
 
-project.extensions.create<ToolkitIntelliJExtension>("intellijToolkit")
+val intellijToolkit = project.extensions.create("intellijToolkit", ToolkitIntelliJExtension::class)
+// TODO: how did this break?
+when {
+    project.name.contains("jetbrains-rider") -> {
+        intellijToolkit.ideFlavor.set(IdeFlavor.RD)
+    }
+
+    project.name.contains("jetbrains-ultimate") -> {
+        intellijToolkit.ideFlavor.set(IdeFlavor.IU)
+    }
+
+    project.name.contains("jetbrains-gateway") -> {
+        intellijToolkit.ideFlavor.set(IdeFlavor.GW)
+    }
+
+    else -> {
+        intellijToolkit.ideFlavor.set(IdeFlavor.IC)
+    }
+}
 
 plugins {
     id("org.jetbrains.intellij.platform.module")
@@ -14,12 +33,6 @@ intellijPlatform {
     instrumentCode = false
 }
 
-dependencies {
-    intellijPlatform {
-        instrumentationTools()
-    }
-}
-
 // CI keeps running out of RAM, so limit IDE instance count to 4
 ciOnly {
     abstract class NoopBuildService : BuildService<BuildServiceParameters.None> {}

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

@@ -87,12 +87,11 @@ intellijPlatform {
 
 dependencies {
     intellijPlatform {
-        instrumentationTools()
+        val version = toolkitIntelliJ.version()
 
         // annoying resolution issue that we don't want to bother fixing
         if (!project.name.contains("jetbrains-gateway")) {
             val type = toolkitIntelliJ.ideFlavor.map { IntelliJPlatformType.fromCode(it.toString()) }
-            val version = toolkitIntelliJ.version()
 
             create(type, version, useInstaller = false)
         }

buildSrc/src/main/kotlin/toolkit-jvm-conventions.gradle.kts

@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import org.gradle.kotlin.dsl.kotlin
-import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import software.aws.toolkits.gradle.jvmTarget
 import software.aws.toolkits.gradle.kotlinTarget
 
@@ -18,11 +19,11 @@ java {
     targetCompatibility = javaVersion
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = javaVersion.majorVersion
-        apiVersion = project.kotlinTarget().get()
-        languageVersion = project.kotlinTarget().get()
-        freeCompilerArgs = listOf("-Xjvm-default=all")
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.fromTarget("21")
+        languageVersion = KotlinVersion.fromVersion(project.kotlinTarget().get())
+        apiVersion = KotlinVersion.fromVersion(project.kotlinTarget().get())
+        jvmDefault.set(JvmDefaultMode.NO_COMPATIBILITY)
     }
 }

buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
     // - The dependency on the Kotlin Standard Library (stdlib) is automatically added when using the Gradle Kotlin plugin and may conflict with the version provided with the IntelliJ Platform, see: https://jb.gg/intellij-platform-kotlin-stdlib
     //- The Kotlin Coroutines library should not be added explicitly to the project as it is already provided with the IntelliJ Platform.
     implementation(versionCatalog.findBundle("kotlin").get())
-    implementation(versionCatalog.findLibrary("kotlin-coroutines").get())
+//    implementation(versionCatalog.findLibrary("kotlin-coroutines").get())
 
     testFixturesApi(versionCatalog.findLibrary("kotlin-test").get())
     testFixturesApi(versionCatalog.findLibrary("kotlin-coroutinesDebug").get()) {

gradle.properties

@@ -8,7 +8,7 @@ toolkitVersion=3.87-SNAPSHOT
 publishToken=
 publishChannel=
 
-ideProfileName=2025.1
+ideProfileName=2025.2
 
 remoteRobotPort=8080
 
@@ -19,7 +19,7 @@ kotlin.code.style=official
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx4g
-kotlin.daemon.jvmargs=-Xmx1500m -Xms500m
+kotlin.daemon.jvmargs=-Xmx2000m -Xms500m
 
 # prefer non-enterprise variant of test-retry
 systemProp.develocity.testretry.enabled=false

gradle/libs.versions.toml

@@ -19,9 +19,9 @@ junit4 = "4.13.2"
 junit5 = "5.11.0"
 # https://plugins.jetbrains.com/docs/intellij/kotlin.html#adding-kotlin-support
 # https://kotlinlang.org/docs/releases.html#release-details
-kotlin = "2.1.20"
+kotlin = "2.2.0"
 # set in <root>/settings.gradle.kts
-kotlinCoroutines = "1.8.0"
+kotlinCoroutines = "1.10.1"
 lsp4j = "0.24.0"
 mockito = "5.12.0"
 mockitoKotlin = "5.4.1-SNAPSHOT"

kotlinResolution.settings.gradle.kts

@@ -15,7 +15,7 @@ dependencyResolutionManagement {
                 }
 
                 "2025.2" -> {
-                    "1.10.1-intellij-4"
+                    "1.10.1-intellij-5"
                 }
 
                 else -> { error("not set") }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt

@@ -19,7 +19,6 @@ import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.testFramework.LightVirtualFile
 import kotlinx.coroutines.withContext
-import org.intellij.images.fileTypes.impl.SvgFileType
 import software.amazon.awssdk.services.codewhispererruntime.model.DocFolderLevel
 import software.amazon.awssdk.services.codewhispererruntime.model.DocInteractionType
 import software.amazon.awssdk.services.codewhispererruntime.model.DocUserDecision
@@ -400,7 +399,7 @@ class DocController(
                 // instead of diff display generated svg in edit/preview window
                 val inMemoryFile = LightVirtualFile(
                     message.filePath,
-                    SvgFileType.INSTANCE,
+                    null,
                     newFileContent
                 )
                 inMemoryFile.isWritable = false