User: joe
Date: 04 Jun 26 10:52
Revision: 7aac1b487424db56d89cd94a8b8d37f3b64e34ea
Summary:
Update to 2026.2 EAP


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10557&personal=false

Index: .github/workflows/publish.yml
===================================================================
--- .github/workflows/publish.yml	(revision d38fb4e6eccb61aff1591a3320aad30e8695a88e)
+++ .github/workflows/publish.yml	(revision 7aac1b487424db56d89cd94a8b8d37f3b64e34ea)
@@ -19,7 +19,7 @@
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
         with:
Index: .github/workflows/test.yml
===================================================================
--- .github/workflows/test.yml	(revision d38fb4e6eccb61aff1591a3320aad30e8695a88e)
+++ .github/workflows/test.yml	(revision 7aac1b487424db56d89cd94a8b8d37f3b64e34ea)
@@ -22,7 +22,7 @@
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
       - uses: actions-ecosystem/action-regex-match@d50fd2e7a37d0e617aea3d7ada663bd56862b9cc
         id: branch-match
         with:
Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision d38fb4e6eccb61aff1591a3320aad30e8695a88e)
+++ build.gradle.kts	(revision 7aac1b487424db56d89cd94a8b8d37f3b64e34ea)
@@ -154,6 +154,7 @@
 
     // For non-SNAPSHOT versions (unless Jetbrains fixes this...) find the version with:
     // afterEvaluate { println(intellijPlatform.productInfo.buildNumber) }
+    gradleToolingExtension(gradleApi())
     gradleToolingExtension(libs.groovy)
     gradleToolingExtension(libs.gradleToolingExtension)
     gradleToolingExtension(libs.annotations)
Index: buildSrc/src/main/kotlin/mcdev-core.gradle.kts
===================================================================
--- buildSrc/src/main/kotlin/mcdev-core.gradle.kts	(revision d38fb4e6eccb61aff1591a3320aad30e8695a88e)
+++ buildSrc/src/main/kotlin/mcdev-core.gradle.kts	(revision 7aac1b487424db56d89cd94a8b8d37f3b64e34ea)
@@ -50,26 +50,26 @@
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 
 tasks.withType<JavaCompile>().configureEach {
     options.encoding = "UTF-8"
     options.compilerArgs = listOf("-proc:none")
-    options.release.set(21)
+    options.release.set(25)
 }
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
     compilerOptions {
-        jvmTarget = JvmTarget.JVM_21
+        jvmTarget = JvmTarget.JVM_25
         languageVersion = KotlinVersion.KOTLIN_2_2
         apiVersion = KotlinVersion.KOTLIN_2_2
         jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
-        freeCompilerArgs = listOf("-Xjdk-release=21")
+        freeCompilerArgs = listOf("-Xjdk-release=25")
         optIn.add("kotlin.contracts.ExperimentalContracts")
     }
 }
Index: gradle.properties
===================================================================
--- gradle.properties	(revision d38fb4e6eccb61aff1591a3320aad30e8695a88e)
+++ gradle.properties	(revision 7aac1b487424db56d89cd94a8b8d37f3b64e34ea)
@@ -21,7 +21,7 @@
 # suppress inspection "UnusedProperty" for whole file
 org.gradle.jvmargs=-Xmx1g
 
-ideaVersionName = 2026.1
+ideaVersionName = 2026.2
 
 coreVersion = 1.8.16
 
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision d38fb4e6eccb61aff1591a3320aad30e8695a88e)
+++ gradle/libs.versions.toml	(revision 7aac1b487424db56d89cd94a8b8d37f3b64e34ea)
@@ -1,6 +1,6 @@
 [versions]
 # https://github.com/JetBrains/intellij-community/blob/<version>/.idea/libraries/kotlin_stdlib.xml
-kotlin = "2.3.20-RC2"
+kotlin = "2.4.0-RC"
 # https://github.com/JetBrains/intellij-community/blob/<version>/.idea/libraries/kotlinx_coroutines_core.xml
 coroutines = "1.10.2"
 junit = "6.0.3"
@@ -9,12 +9,12 @@
 licenser = "0.7.5"
 changelog = "2.5.0"
 # https://github.com/JetBrains/intellij-platform-gradle-plugin
-intellij-plugin = "2.13.1"
+intellij-plugin = "2.16.0"
 # https://central.sonatype.com/artifact/org.jetbrains.intellij/plugin-repository-rest-client
-intellij-plugin-repository-rest-client = "2.0.50"
+intellij-plugin-repository-rest-client = "2.0.51"
 # https://www.jetbrains.com/intellij-repository/snapshots or https://www.jetbrains.com/intellij-repository/releases/
 # Search for com.jetbrains.intellij.idea
-intellij-ide = "261.22158.277"
+intellij-ide = "262.7132-EAP-CANDIDATE-SNAPSHOT"
 # https://github.com/JetBrains/gradle-idea-ext-plugin
 idea-ext = "1.4.1"
 
@@ -51,7 +51,7 @@
 # Gradle Tooling
 # https://www.jetbrains.com/intellij-repository/snapshots or https://www.jetbrains.com/intellij-repository/releases/
 # Search for com.jetbrains.intellij.gradle
-gradleToolingExtension = { module = "com.jetbrains.intellij.gradle:gradle-tooling-extension", version = "253.29346.138" }
+gradleToolingExtension = { module = "com.jetbrains.intellij.gradle:gradle-tooling-extension", version = "262.7132.12" }
 annotations = "org.jetbrains:annotations:26.1.0"
 groovy = "org.codehaus.groovy:groovy:3.0.25"
 
Index: gradle/wrapper/gradle-wrapper.properties
===================================================================
--- gradle/wrapper/gradle-wrapper.properties	(revision d38fb4e6eccb61aff1591a3320aad30e8695a88e)
+++ gradle/wrapper/gradle-wrapper.properties	(revision 7aac1b487424db56d89cd94a8b8d37f3b64e34ea)
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
Index: src/main/kotlin/insight/generation/EventGenHelper.kt
===================================================================
--- src/main/kotlin/insight/generation/EventGenHelper.kt	(revision d38fb4e6eccb61aff1591a3320aad30e8695a88e)
+++ src/main/kotlin/insight/generation/EventGenHelper.kt	(revision 7aac1b487424db56d89cd94a8b8d37f3b64e34ea)
@@ -37,9 +37,9 @@
 import org.jetbrains.kotlin.analysis.api.KaIdeApi
 import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferences
 import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferencesInRange
+import org.jetbrains.kotlin.idea.base.codeInsight.ShortenReferencesFacility
 import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
 import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginModeProvider
-import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtPsiFactory
@@ -115,7 +115,7 @@
         val entry = factory.createSuperTypeEntry(fqn)
         val insertedEntry = ktClass.addSuperTypeListEntry(entry)
         when (KotlinPluginModeProvider.currentPluginMode) {
-            KotlinPluginMode.K1 -> @OptIn(K1Deprecation::class) ShortenReferences.DEFAULT.process(insertedEntry)
+            KotlinPluginMode.K1 -> @OptIn(K1Deprecation::class) ShortenReferencesFacility.getInstance().shorten(insertedEntry)
             // TODO find a non-internal alternative to this...
             KotlinPluginMode.K2 -> @OptIn(KaIdeApi::class) shortenReferences(insertedEntry)
         }
@@ -129,7 +129,7 @@
 
         val marker = JvmEventGenHelper.doReformat(project, file, startOffset, endOffset) ?: return
         when (KotlinPluginModeProvider.currentPluginMode) {
-            KotlinPluginMode.K1 -> @OptIn(K1Deprecation::class) ShortenReferences.DEFAULT.process(file, marker.startOffset, marker.endOffset)
+            KotlinPluginMode.K1 -> @OptIn(K1Deprecation::class) ShortenReferencesFacility.getInstance().shorten(file, marker.textRange)
             // TODO find a non-internal alternative to this...
             KotlinPluginMode.K2 -> @OptIn(KaIdeApi::class) shortenReferencesInRange(file, marker.textRange)
         }
Index: src/main/kotlin/platform/mcp/fabricloom/FabricLoomDecompileSourceProvider.kt
===================================================================
--- src/main/kotlin/platform/mcp/fabricloom/FabricLoomDecompileSourceProvider.kt	(revision d38fb4e6eccb61aff1591a3320aad30e8695a88e)
+++ src/main/kotlin/platform/mcp/fabricloom/FabricLoomDecompileSourceProvider.kt	(revision 7aac1b487424db56d89cd94a8b8d37f3b64e34ea)
@@ -31,16 +31,29 @@
 import com.intellij.openapi.roots.OrderRootType
 import com.intellij.openapi.roots.impl.libraries.LibraryEx
 import com.intellij.openapi.util.ActionCallback
+import com.intellij.platform.workspace.jps.entities.LibraryEntity
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiJavaFile
 import java.nio.file.Paths
 import org.jetbrains.plugins.gradle.util.GradleUtil
 
 class FabricLoomDecompileSourceProvider : AttachSourcesProvider {
+    @Deprecated("Deprecated in AttachSourcesProvider")
     override fun getActions(
         orderEntries: List<LibraryOrderEntry>,
         psiFile: PsiFile,
     ): Collection<AttachSourcesProvider.AttachSourcesAction> {
+        return getDecompileActions(psiFile)
+    }
+
+    override fun getLibrariesActions(
+        libraryEntities: Collection<LibraryEntity?>,
+        psiFile: PsiFile
+    ): Collection<AttachSourcesProvider.AttachSourcesAction?> {
+        return getDecompileActions(psiFile)
+    }
+
+    private fun getDecompileActions(psiFile: PsiFile): Collection<AttachSourcesProvider.AttachSourcesAction> {
         if (psiFile !is PsiJavaFile || !psiFile.packageName.startsWith("net.minecraft")) {
             return emptyList()
         }
Index: src/main/kotlin/platform/mcp/fabricloom/TinyUnscrambler.kt
===================================================================
--- src/main/kotlin/platform/mcp/fabricloom/TinyUnscrambler.kt	(revision d38fb4e6eccb61aff1591a3320aad30e8695a88e)
+++ src/main/kotlin/platform/mcp/fabricloom/TinyUnscrambler.kt	(revision 7aac1b487424db56d89cd94a8b8d37f3b64e34ea)
@@ -26,8 +26,8 @@
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.ui.ComboBox
-import com.intellij.ui.SimpleListCellRenderer
 import com.intellij.ui.components.JBLabel
+import com.intellij.ui.dsl.listCellRenderer.textListCellRenderer
 import com.intellij.uiDesigner.core.GridConstraints
 import com.intellij.uiDesigner.core.GridLayoutManager
 import com.intellij.unscramble.UnscrambleSupport
@@ -55,10 +55,7 @@
         val mappingsBox: ComboBox<String> = ComboBox(mappingsBoxModel as ComboBoxModel<String>)
 
         init {
-            mappingsBox.renderer = SimpleListCellRenderer.create { label, value, _ ->
-                val path = mappingsBoxModel.getValue(value)
-                label.text = "[$value] $path"
-            }
+            mappingsBox.renderer = textListCellRenderer { "[$it] ${mappingsBoxModel.getValue(it)}" }
             add(
                 JBLabel("Mappings: "),
                 GridConstraints(
Index: src/main/kotlin/platform/mcp/vanillagradle/VanillaGradleDecompileSourceProvider.kt
===================================================================
--- src/main/kotlin/platform/mcp/vanillagradle/VanillaGradleDecompileSourceProvider.kt	(revision d38fb4e6eccb61aff1591a3320aad30e8695a88e)
+++ src/main/kotlin/platform/mcp/vanillagradle/VanillaGradleDecompileSourceProvider.kt	(revision 7aac1b487424db56d89cd94a8b8d37f3b64e34ea)
@@ -31,6 +31,7 @@
 import com.intellij.openapi.externalSystem.util.ExternalSystemUtil
 import com.intellij.openapi.roots.LibraryOrderEntry
 import com.intellij.openapi.util.ActionCallback
+import com.intellij.platform.workspace.jps.entities.LibraryEntity
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiJavaFile
 import java.nio.file.Paths
@@ -38,10 +39,22 @@
 import org.jetbrains.plugins.gradle.util.GradleUtil
 
 class VanillaGradleDecompileSourceProvider : AttachSourcesProvider {
+    @Deprecated("Deprecated in AttachSourcesProvider")
     override fun getActions(
         orderEntries: List<LibraryOrderEntry>,
+        psiFile: PsiFile
+    ): Collection<AttachSourcesProvider.AttachSourcesAction> {
+        return getDecompileActions(psiFile)
+    }
+
+    override fun getLibrariesActions(
+        orderEntries: Collection<LibraryEntity>,
         psiFile: PsiFile,
     ): Collection<AttachSourcesProvider.AttachSourcesAction> {
+        return getDecompileActions(psiFile)
+    }
+
+    private fun getDecompileActions(psiFile: PsiFile): Collection<AttachSourcesProvider.AttachSourcesAction> {
         if (psiFile !is PsiJavaFile || !psiFile.packageName.startsWith("net.minecraft")) {
             return emptyList()
         }