Skip to content

Commit af450ce

Browse files
committed
2025.2
It looks like bundling Kotlin causes issues in this EAP, so making Kotlin stdlib compileOnly for now
1 parent e5e7406 commit af450ce

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ dependencies {
9494
implementation(libs.mappingIo)
9595
implementation(libs.bundles.asm)
9696

97-
implementation(libs.bundles.fuel)
97+
implementation(libs.bundles.fuel) {
98+
exclude(group = "org.jetbrains.kotlin")
99+
exclude(group = "org.jetbrains.kotlinx")
100+
}
98101

99102
intellijPlatform {
100103
intellijIdeaCommunity(libs.versions.intellij.ide, useInstaller = false)
@@ -108,7 +111,7 @@ dependencies {
108111
bundledPlugin("org.intellij.intelliLang")
109112
bundledPlugin("com.intellij.properties")
110113
bundledPlugin("Git4Idea")
111-
bundledPlugin("com.intellij.modules.json")
114+
bundledPlugin("com.intellij.json")
112115

113116
// Optional dependencies
114117
bundledPlugin("org.jetbrains.kotlin")

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,11 @@ repositories {
103103

104104
val libs = the<LibrariesForLibs>()
105105
dependencies {
106-
implementation(libs.kotlin.stdlib)
107-
implementation(libs.kotlin.reflect)
106+
compileOnly(libs.kotlin.stdlib)
107+
compileOnly(libs.kotlin.reflect)
108108
implementation(libs.bundles.coroutines) {
109109
exclude(module = "kotlinx-coroutines-core-jvm")
110+
exclude(group = "org.jetbrains.kotlin")
110111
}
111112

112113
testImplementation(libs.junit.api)

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 = 2025.1
24+
ideaVersionName = 2025.2
2525

2626
coreVersion = 1.8.4
2727

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
2-
kotlin = "2.0.20"
3-
coroutines = "1.9.0-RC.2"
2+
kotlin = "2.1.21"
3+
coroutines = "1.10.2"
44
junit = "5.10.2"
55
junit-platform = "1.10.2"
66
asm = "9.6"
77
fuel = "2.3.1"
88
licenser = "0.6.1"
99
changelog = "2.2.0"
10-
intellij-plugin = "2.5.0"
10+
intellij-plugin = "2.6.0"
1111
intellij-plugin-repository-rest-client = "2.0.46"
12-
intellij-ide = "2025.1"
12+
intellij-ide = "252.13776.59-EAP-SNAPSHOT"
1313
idea-ext = "1.1.10"
1414
psiPlugin = "251.175"
1515

@@ -42,7 +42,7 @@ jflex-skeleton = "org.jetbrains.idea:jflex:1.7.0-c1fdf11"
4242
grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1"
4343

4444
# Gradle Tooling
45-
gradleToolingExtension = { module = "com.jetbrains.intellij.gradle:gradle-tooling-extension", version = "251.23774.435" }
45+
gradleToolingExtension = { module = "com.jetbrains.intellij.gradle:gradle-tooling-extension", version = "252.13776.59-EAP-SNAPSHOT" }
4646
annotations = "org.jetbrains:annotations:24.0.0"
4747
groovy = "org.codehaus.groovy:groovy:3.0.19"
4848

src/main/resources/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<depends optional="true" config-file="mcdev-kotlin.xml">org.jetbrains.kotlin</depends>
2727
<depends>org.intellij.groovy</depends>
2828
<depends>com.intellij.properties</depends>
29-
<depends>com.intellij.modules.json</depends>
29+
<depends>com.intellij.json</depends>
3030
<depends>ByteCodeViewer</depends>
3131
<depends optional="true" config-file="mcdev-toml.xml">org.toml.lang</depends>
3232
<depends optional="true" config-file="mcdev-yaml.xml">org.jetbrains.plugins.yaml</depends>

0 commit comments

Comments
 (0)