chore: support 261

.github/workflows/build.yaml

@@ -25,12 +25,12 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
       - name: Setup Gradle (with caching)
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
         with:
           # Avoid writing to cache from PRs from forks; still fine for same-repo PRs
           cache-read-only: ${{ github.event_name == 'pull_request' }}
@@ -40,7 +40,7 @@ jobs:
           GRADLE_OPTS: -Dfile.encoding=UTF-8
         run: ./gradlew --stacktrace --info --warning-mode all :spring-bootstrap:test
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v5
+        uses: mikepenz/action-junit-report@v6
         if: success() || failure() # always run even if the previous step fails
         with:
           verbose_summary: true

.github/workflows/release.yaml

@@ -12,12 +12,12 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v5
       - run: echo "ESCAPED_BRANCH_NAME=$(echo "$GITHUB_REF_NAME" | sed -e 's|release/||g' | sed -e 's|/|_|g' )" >> $GITHUB_ENV
       - name: Sign Plugin
         env:
@@ -27,15 +27,15 @@ jobs:
           PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
         run: ./gradlew --info :spring-bootstrap:buildPlugin :spring-bootstrap:signPlugin :spring-bootstrap:publishPlugin -PsnapshotVersion=$GITHUB_RUN_NUMBER -PdistFilePostfix=$ESCAPED_BRANCH_NAME-b$GITHUB_RUN_NUMBER -PsetUntilVersion | tee build.log
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: dist-without-markdown
           compression-level: 0
           retention-days: 5
           path: |
             modules/spring-bootstrap/build/distributions/*.zip
       - name: Build log
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: build-log
           compression-level: 0

build.gradle.kts

@@ -30,6 +30,12 @@ subprojects {
     apply(plugin = "java")
     apply(plugin = "org.jetbrains.intellij.platform")
 
+    val junitBomVersion: String by rootProject
+
+    dependencies {
+        add("testImplementation", platform("org.junit:junit-bom:$junitBomVersion"))
+    }
+
     // This syntax is used to avoid duplicated in compileKotlin and compileTestKotlin settings
     //noinspection GroovyAssignabilityCheck
 
@@ -38,7 +44,11 @@ subprojects {
     tasks.withType<KotlinJvmCompile>().configureEach {
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_21)
-            freeCompilerArgs.addAll("-Xjvm-default=all-compatibility", "-Xjsr305=strict")
+            freeCompilerArgs.addAll(listOf(
+                "-Xjvm-default=all-compatibility",
+                "-Xjsr305=strict",
+                "-opt-in=org.jetbrains.kotlin.K1Deprecation"
+            ))
         }
     }
 

gradle.properties

@@ -6,10 +6,12 @@ org.gradle.parallel=true
 # Let Gradle choose optimal workers; override with ORG_GRADLE_PROJECT_org_gradle_workers_max if needed
 # org.gradle.workers.max=0
 kotlin.stdlib.default.dependency=false
-kotlinVersion=2.2.0
-gradleIntellijPluginVersion=2.10.4
+kotlinVersion=2.3.20
+# Keep JUnit Platform artifacts aligned with the IntelliJ Platform test framework
+junitBomVersion=5.13.4
+gradleIntellijPluginVersion=2.13.1
 #defaultIdeaVersion=2025.2
-defaultIdeaVersion=253.28294.334
+defaultIdeaVersion=261-EAP-SNAPSHOT
 defaultIdeaType=IC
 org.jetbrains.intellij.platform.selfUpdateCheck=false
 org.jetbrains.intellij.platform.downloadSources=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

modules/jpa/jpa.gradle.kts

@@ -80,7 +80,7 @@ dependencies {
     }
     testImplementation(project(":test-framework"))
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }
 
 kotlin {

modules/quarkus-core/quarkus-core.gradle.kts

@@ -72,7 +72,7 @@ dependencies {
     }
     testImplementation(project(":test-framework"))
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }
 
 kotlin {

modules/spring-ai/spring-ai.gradle.kts

@@ -71,7 +71,7 @@ dependencies {
     }
     testImplementation(project(":test-framework"))
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }
 
 kotlin {

modules/spring-aop/spring-aop.gradle.kts

@@ -63,7 +63,7 @@ dependencies {
     }
     testImplementation(project(":test-framework"))
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 
 }
 

modules/spring-bootstrap/spring-bootstrap.gradle.kts

@@ -148,7 +148,7 @@ dependencies {
     }
     testImplementation(testFramework)
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 
     @Suppress("UNCHECKED_CAST")
     intellijPlatform {

modules/spring-core/spring-core.gradle.kts

@@ -88,7 +88,7 @@ dependencies {
     }
     testImplementation(project(":test-framework"))
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }
 
 kotlin {

modules/spring-core/src/test/kotlin/com/explyt/spring/core/service/java/SpringSearchServiceTest.kt

@@ -21,10 +21,10 @@ import com.explyt.spring.core.service.SpringSearchService
 import com.explyt.spring.core.service.SpringSearchServiceFacade
 import com.explyt.spring.test.ExplytJavaLightTestCase
 import com.explyt.spring.test.TestLibrary
+import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.psi.PsiMethod
 import junit.framework.TestCase
-import org.jetbrains.kotlin.idea.util.projectStructure.getModule
 
 class SpringSearchServiceTest : ExplytJavaLightTestCase() {
     override val libraries: Array<TestLibrary> = arrayOf(TestLibrary.springBootAutoConfigure_3_1_1)
@@ -41,7 +41,7 @@ class SpringSearchServiceTest : ExplytJavaLightTestCase() {
 
     fun testImportComponent() {
         val virtualFile = myFixture.copyDirectoryToProject("service/importComponent", "")
-        val module = virtualFile.getModule(project)
+        val module = ModuleUtilCore.findModuleForFile(virtualFile, project)
         TestCase.assertNotNull(module)
         val beans = SpringSearchService.getInstance(project).getBeanPsiClassesAnnotatedByComponent(module!!)
         val beanNames = beans.mapNotNullTo(mutableSetOf()) { it.psiClass.qualifiedName }
@@ -51,7 +51,7 @@ class SpringSearchServiceTest : ExplytJavaLightTestCase() {
 
     fun testImportWithBean() {
         val virtualFile = myFixture.copyDirectoryToProject("service/importComponentWithBean", "")
-        val module = virtualFile.getModule(project)
+        val module = ModuleUtilCore.findModuleForFile(virtualFile, project)
         TestCase.assertNotNull(module)
         val beans = SpringSearchServiceFacade.getInstance(project).getAllActiveBeans(module!!)
         val beanNames = beans.filter { it.psiClass.qualifiedName?.startsWith("com.") == true }
@@ -63,7 +63,7 @@ class SpringSearchServiceTest : ExplytJavaLightTestCase() {
 
     fun testImportComplexWithComponentScan() {
         val virtualFile = myFixture.copyDirectoryToProject("service/importComplexWithComponentScan", "")
-        val module = virtualFile.getModule(project)
+        val module = ModuleUtilCore.findModuleForFile(virtualFile, project)
         TestCase.assertNotNull(module)
         val beans = SpringSearchServiceFacade.getInstance(project).getAllActiveBeans(module!!)
         val beanNames = beans.filter { it.psiClass.qualifiedName?.startsWith("com.") == true }
@@ -79,7 +79,7 @@ class SpringSearchServiceTest : ExplytJavaLightTestCase() {
 
     fun testComponentMissingBeanSearch() {
         val virtualFile = myFixture.copyDirectoryToProject("service/conditionalOnMissingBean", "")
-        val module = virtualFile.getModule(project)
+        val module = ModuleUtilCore.findModuleForFile(virtualFile, project)
         assertNotNull(module)
         val beans = SpringSearchServiceFacade.getInstance(project).getAllActiveBeans(module!!)
         val beanTestClass = beans.filter { it.name == "testClass" }

modules/spring-core/src/test/kotlin/com/explyt/spring/core/service/kotlin/SpringSearchServiceTest.kt

@@ -21,10 +21,10 @@ import com.explyt.spring.core.service.SpringSearchService
 import com.explyt.spring.core.service.SpringSearchServiceFacade
 import com.explyt.spring.test.ExplytKotlinLightTestCase
 import com.explyt.spring.test.TestLibrary
+import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.psi.PsiMethod
 import junit.framework.TestCase
-import org.jetbrains.kotlin.idea.util.projectStructure.getModule
 
 class SpringSearchServiceTest : ExplytKotlinLightTestCase() {
     override val libraries: Array<TestLibrary> = arrayOf(TestLibrary.springBootAutoConfigure_3_1_1)
@@ -41,7 +41,7 @@ class SpringSearchServiceTest : ExplytKotlinLightTestCase() {
 
     fun testImportComponent() {
         val virtualFile = myFixture.copyDirectoryToProject("service/importComponent", "")
-        val module = virtualFile.getModule(project)
+        val module = ModuleUtilCore.findModuleForFile(virtualFile, project)
         TestCase.assertNotNull(module)
         val beans = SpringSearchService.getInstance(project).getBeanPsiClassesAnnotatedByComponent(module!!)
         val beanNames = beans.filter { it.psiClass.qualifiedName?.startsWith("com.") == true }
@@ -52,7 +52,7 @@ class SpringSearchServiceTest : ExplytKotlinLightTestCase() {
 
     fun testImportWithBean() {
         val virtualFile = myFixture.copyDirectoryToProject("service/importComponentWithBean", "")
-        val module = virtualFile.getModule(project)
+        val module = ModuleUtilCore.findModuleForFile(virtualFile, project)
         TestCase.assertNotNull(module)
         val beans = SpringSearchServiceFacade.getInstance(project).getAllActiveBeans(module!!)
         val beanNames = beans.filter { it.psiClass.qualifiedName?.startsWith("com.") == true }
@@ -64,7 +64,7 @@ class SpringSearchServiceTest : ExplytKotlinLightTestCase() {
 
     fun testImportComplexWithComponentScan() {
         val virtualFile = myFixture.copyDirectoryToProject("service/importComplexWithComponentScan", "")
-        val module = virtualFile.getModule(project)
+        val module = ModuleUtilCore.findModuleForFile(virtualFile, project)
         TestCase.assertNotNull(module)
         val beans = SpringSearchServiceFacade.getInstance(project).getAllActiveBeans(module!!)
         val beanNames = beans.filter { it.psiClass.qualifiedName?.startsWith("com.") == true }
@@ -80,7 +80,7 @@ class SpringSearchServiceTest : ExplytKotlinLightTestCase() {
 
     fun testComponentMissingBeanSearch() {
         val virtualFile = myFixture.copyDirectoryToProject("service/conditionalOnMissingBean", "")
-        val module = virtualFile.getModule(project)
+        val module = ModuleUtilCore.findModuleForFile(virtualFile, project)
         assertNotNull(module)
         val beans = SpringSearchServiceFacade.getInstance(project).getAllActiveBeans(module!!)
         val beanTestClass = beans.filter { it.name == "testClass" }

modules/spring-data/spring-data.gradle.kts

@@ -72,7 +72,7 @@ dependencies {
     }
     testImplementation(project(":test-framework"))
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }
 
 kotlin {

modules/spring-gradle/spring-gradle.gradle.kts

@@ -64,7 +64,7 @@ dependencies {
     }
     testImplementation(project(":test-framework"))
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }
 
 kotlin {

modules/spring-security/spring-security.gradle.kts

@@ -63,7 +63,7 @@ dependencies {
     }
     testImplementation(project(":test-framework"))
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }
 
 kotlin {

modules/spring-web/spring-web.gradle.kts

@@ -73,7 +73,7 @@ dependencies {
     }
     testImplementation(project(":test-framework"))
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.2")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }
 
 kotlin {

modules/spring-web/src/main/kotlin/com/explyt/spring/web/action/SpringWebKotlinMethodGenerateAction.kt

@@ -43,8 +43,9 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.Messages
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiFile
-import org.jetbrains.kotlin.idea.refactoring.isInterfaceClass
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.uast.UClass
+import org.jetbrains.uast.toUElement
 
 class SpringWebKotlinMethodGenerateAction : BaseGenerateAction(KotlinWebMethodHandler()) {
     init {
@@ -77,7 +78,7 @@ private class KotlinWebMethodHandler : CodeInsightActionHandler {
                 PsiDocumentManager.getInstance(file.project).commitDocument(document)
 
                 val offsetToInsert = KotlinMethodGenerateUtils.findOffsetToInsertMethod(editor, file, targetClass)
-                val isInterface = targetClass?.isInterfaceClass() == true
+                val isInterface = (targetClass.toUElement() as? UClass)?.isInterface == true
                 val template = getTemplate(file.project, httpMethod, isInterface) ?: return@runWriteAction
 
                 editor.caretModel.moveToOffset(offsetToInsert)

settings.gradle.kts

@@ -22,7 +22,7 @@ pluginManagement {
 
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
-    id("org.jetbrains.intellij.platform.settings") version "2.10.4"
+    id("org.jetbrains.intellij.platform.settings") version "2.13.1"
 }
 
 @Suppress("UnstableApiUsage")