Skip to content

Commit 7aac1b4

Browse files
EarthcomputerEarthcomputer
committed
Update to 2026.2 EAP
1 parent d38fb4e commit 7aac1b4

11 files changed

Lines changed: 46 additions & 22 deletions

File tree

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/setup-java@v5
2020
with:
2121
distribution: 'temurin'
22-
java-version: 21
22+
java-version: 25
2323
- name: Setup Gradle
2424
uses: gradle/actions/setup-gradle@v5
2525
with:

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-java@v5
2323
with:
2424
distribution: 'temurin'
25-
java-version: 21
25+
java-version: 25
2626
- uses: actions-ecosystem/action-regex-match@d50fd2e7a37d0e617aea3d7ada663bd56862b9cc
2727
id: branch-match
2828
with:

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ dependencies {
154154

155155
// For non-SNAPSHOT versions (unless Jetbrains fixes this...) find the version with:
156156
// afterEvaluate { println(intellijPlatform.productInfo.buildNumber) }
157+
gradleToolingExtension(gradleApi())
157158
gradleToolingExtension(libs.groovy)
158159
gradleToolingExtension(libs.gradleToolingExtension)
159160
gradleToolingExtension(libs.annotations)

‎buildSrc/src/main/kotlin/mcdev-core.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,26 @@ if (System.getenv("CI") != "true") {
5050

5151
java {
5252
toolchain {
53-
languageVersion.set(JavaLanguageVersion.of(21))
53+
languageVersion.set(JavaLanguageVersion.of(25))
5454
}
5555
}
5656

5757
tasks.withType<JavaCompile>().configureEach {
5858
options.encoding = "UTF-8"
5959
options.compilerArgs = listOf("-proc:none")
60-
options.release.set(21)
60+
options.release.set(25)
6161
}
6262

6363
kotlin {
6464
jvmToolchain {
65-
languageVersion.set(JavaLanguageVersion.of(21))
65+
languageVersion.set(JavaLanguageVersion.of(25))
6666
}
6767
compilerOptions {
68-
jvmTarget = JvmTarget.JVM_21
68+
jvmTarget = JvmTarget.JVM_25
6969
languageVersion = KotlinVersion.KOTLIN_2_2
7070
apiVersion = KotlinVersion.KOTLIN_2_2
7171
jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
72-
freeCompilerArgs = listOf("-Xjdk-release=21")
72+
freeCompilerArgs = listOf("-Xjdk-release=25")
7373
optIn.add("kotlin.contracts.ExperimentalContracts")
7474
}
7575
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# suppress inspection "UnusedProperty" for whole file
2222
org.gradle.jvmargs=-Xmx1g
2323

24-
ideaVersionName = 2026.1
24+
ideaVersionName = 2026.2
2525

2626
coreVersion = 1.8.16
2727

‎gradle/libs.versions.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
# https://github.com/JetBrains/intellij-community/blob/<version>/.idea/libraries/kotlin_stdlib.xml
3-
kotlin = "2.3.20-RC2"
3+
kotlin = "2.4.0-RC"
44
# https://github.com/JetBrains/intellij-community/blob/<version>/.idea/libraries/kotlinx_coroutines_core.xml
55
coroutines = "1.10.2"
66
junit = "6.0.3"
@@ -9,12 +9,12 @@ fuel = "2.3.1"
99
licenser = "0.7.5"
1010
changelog = "2.5.0"
1111
# https://github.com/JetBrains/intellij-platform-gradle-plugin
12-
intellij-plugin = "2.13.1"
12+
intellij-plugin = "2.16.0"
1313
# https://central.sonatype.com/artifact/org.jetbrains.intellij/plugin-repository-rest-client
14-
intellij-plugin-repository-rest-client = "2.0.50"
14+
intellij-plugin-repository-rest-client = "2.0.51"
1515
# https://www.jetbrains.com/intellij-repository/snapshots or https://www.jetbrains.com/intellij-repository/releases/
1616
# Search for com.jetbrains.intellij.idea
17-
intellij-ide = "261.22158.277"
17+
intellij-ide = "262.7132-EAP-CANDIDATE-SNAPSHOT"
1818
# https://github.com/JetBrains/gradle-idea-ext-plugin
1919
idea-ext = "1.4.1"
2020

@@ -51,7 +51,7 @@ grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1"
5151
# Gradle Tooling
5252
# https://www.jetbrains.com/intellij-repository/snapshots or https://www.jetbrains.com/intellij-repository/releases/
5353
# Search for com.jetbrains.intellij.gradle
54-
gradleToolingExtension = { module = "com.jetbrains.intellij.gradle:gradle-tooling-extension", version = "253.29346.138" }
54+
gradleToolingExtension = { module = "com.jetbrains.intellij.gradle:gradle-tooling-extension", version = "262.7132.12" }
5555
annotations = "org.jetbrains:annotations:26.1.0"
5656
groovy = "org.codehaus.groovy:groovy:3.0.25"
5757

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎src/main/kotlin/insight/generation/EventGenHelper.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import org.jetbrains.kotlin.K1Deprecation
3737
import org.jetbrains.kotlin.analysis.api.KaIdeApi
3838
import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferences
3939
import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferencesInRange
40+
import org.jetbrains.kotlin.idea.base.codeInsight.ShortenReferencesFacility
4041
import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
4142
import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginModeProvider
42-
import org.jetbrains.kotlin.idea.core.ShortenReferences
4343
import org.jetbrains.kotlin.psi.KtClassOrObject
4444
import org.jetbrains.kotlin.psi.KtFile
4545
import org.jetbrains.kotlin.psi.KtPsiFactory
@@ -115,7 +115,7 @@ class KotlinEventGenHelper : EventGenHelper {
115115
val entry = factory.createSuperTypeEntry(fqn)
116116
val insertedEntry = ktClass.addSuperTypeListEntry(entry)
117117
when (KotlinPluginModeProvider.currentPluginMode) {
118-
KotlinPluginMode.K1 -> @OptIn(K1Deprecation::class) ShortenReferences.DEFAULT.process(insertedEntry)
118+
KotlinPluginMode.K1 -> @OptIn(K1Deprecation::class) ShortenReferencesFacility.getInstance().shorten(insertedEntry)
119119
// TODO find a non-internal alternative to this...
120120
KotlinPluginMode.K2 -> @OptIn(KaIdeApi::class) shortenReferences(insertedEntry)
121121
}
@@ -129,7 +129,7 @@ class KotlinEventGenHelper : EventGenHelper {
129129

130130
val marker = JvmEventGenHelper.doReformat(project, file, startOffset, endOffset) ?: return
131131
when (KotlinPluginModeProvider.currentPluginMode) {
132-
KotlinPluginMode.K1 -> @OptIn(K1Deprecation::class) ShortenReferences.DEFAULT.process(file, marker.startOffset, marker.endOffset)
132+
KotlinPluginMode.K1 -> @OptIn(K1Deprecation::class) ShortenReferencesFacility.getInstance().shorten(file, marker.textRange)
133133
// TODO find a non-internal alternative to this...
134134
KotlinPluginMode.K2 -> @OptIn(KaIdeApi::class) shortenReferencesInRange(file, marker.textRange)
135135
}

‎src/main/kotlin/platform/mcp/fabricloom/FabricLoomDecompileSourceProvider.kt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,29 @@ import com.intellij.openapi.roots.LibraryOrderEntry
3131
import com.intellij.openapi.roots.OrderRootType
3232
import com.intellij.openapi.roots.impl.libraries.LibraryEx
3333
import com.intellij.openapi.util.ActionCallback
34+
import com.intellij.platform.workspace.jps.entities.LibraryEntity
3435
import com.intellij.psi.PsiFile
3536
import com.intellij.psi.PsiJavaFile
3637
import java.nio.file.Paths
3738
import org.jetbrains.plugins.gradle.util.GradleUtil
3839

3940
class FabricLoomDecompileSourceProvider : AttachSourcesProvider {
41+
@Deprecated("Deprecated in AttachSourcesProvider")
4042
override fun getActions(
4143
orderEntries: List<LibraryOrderEntry>,
4244
psiFile: PsiFile,
4345
): Collection<AttachSourcesProvider.AttachSourcesAction> {
46+
return getDecompileActions(psiFile)
47+
}
48+
49+
override fun getLibrariesActions(
50+
libraryEntities: Collection<LibraryEntity?>,
51+
psiFile: PsiFile
52+
): Collection<AttachSourcesProvider.AttachSourcesAction?> {
53+
return getDecompileActions(psiFile)
54+
}
55+
56+
private fun getDecompileActions(psiFile: PsiFile): Collection<AttachSourcesProvider.AttachSourcesAction> {
4457
if (psiFile !is PsiJavaFile || !psiFile.packageName.startsWith("net.minecraft")) {
4558
return emptyList()
4659
}

‎src/main/kotlin/platform/mcp/fabricloom/TinyUnscrambler.kt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import com.intellij.openapi.module.ModuleManager
2626
import com.intellij.openapi.project.Project
2727
import com.intellij.openapi.project.ProjectManager
2828
import com.intellij.openapi.ui.ComboBox
29-
import com.intellij.ui.SimpleListCellRenderer
3029
import com.intellij.ui.components.JBLabel
30+
import com.intellij.ui.dsl.listCellRenderer.textListCellRenderer
3131
import com.intellij.uiDesigner.core.GridConstraints
3232
import com.intellij.uiDesigner.core.GridLayoutManager
3333
import com.intellij.unscramble.UnscrambleSupport
@@ -55,10 +55,7 @@ class TinyUnscrambler : UnscrambleSupport<TinyUnscrambler.SettingsComponent> {
5555
val mappingsBox: ComboBox<String> = ComboBox(mappingsBoxModel as ComboBoxModel<String>)
5656

5757
init {
58-
mappingsBox.renderer = SimpleListCellRenderer.create { label, value, _ ->
59-
val path = mappingsBoxModel.getValue(value)
60-
label.text = "[$value] $path"
61-
}
58+
mappingsBox.renderer = textListCellRenderer { "[$it] ${mappingsBoxModel.getValue(it)}" }
6259
add(
6360
JBLabel("Mappings: "),
6461
GridConstraints(

0 commit comments

Comments
 (0)