Skip to content

Commit 8c20001

Browse files
committed
Merge branch '2026.1' into 2026.2
2 parents e99d90f + c02db4e commit 8c20001

31 files changed

Lines changed: 1293 additions & 710 deletions

build.gradle.kts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,14 @@
1919
*/
2020

2121
import io.sentry.android.gradle.extensions.SentryPluginExtension
22-
import java.util.concurrent.atomic.AtomicInteger
23-
import kotlin.concurrent.atomics.AtomicInt
2422
import org.gradle.kotlin.dsl.configure
2523
import org.jetbrains.changelog.Changelog
2624
import org.jetbrains.gradle.ext.settings
2725
import org.jetbrains.gradle.ext.taskTriggers
2826
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
29-
import org.jetbrains.intellij.platform.gradle.tasks.CleanSandboxTask
3027
import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
3128

3229
plugins {
33-
groovy
3430
id(libs.plugins.changelog.get().pluginId)
3531
alias(libs.plugins.idea.ext)
3632
`mcdev-core`
@@ -153,10 +149,7 @@ dependencies {
153149
}
154150
testLibs(projects.mixinTestData)
155151

156-
// For non-SNAPSHOT versions (unless Jetbrains fixes this...) find the version with:
157-
// afterEvaluate { println(intellijPlatform.productInfo.buildNumber) }
158152
gradleToolingExtension(gradleApi())
159-
gradleToolingExtension(libs.groovy)
160153
gradleToolingExtension(libs.gradleToolingExtension)
161154
gradleToolingExtension(libs.annotations)
162155
}
@@ -189,11 +182,6 @@ tasks.named(gradleToolingExtensionSourceSet.compileJavaTaskName, JavaCompile::cl
189182
options.release = 8
190183
options.compilerArgs = listOf("-Xlint:-options")
191184
}
192-
tasks.withType<GroovyCompile>().configureEach {
193-
options.compilerArgs = listOf("-proc:none")
194-
sourceCompatibility = "1.8"
195-
targetCompatibility = "1.8"
196-
}
197185

198186
tasks.processResources {
199187
// These templates aren't allowed to be in a directory structure in the output jar
@@ -264,7 +252,7 @@ idea {
264252
}
265253

266254
license {
267-
val endings = listOf("java", "kt", "kts", "groovy", "gradle.kts", "xml", "properties", "html", "flex", "bnf")
255+
val endings = listOf("java", "kt", "kts", "gradle.kts", "xml", "properties", "html", "flex", "bnf")
268256
exclude("META-INF/plugin.xml") // https://youtrack.jetbrains.com/issue/IDEA-345026
269257
exclude("sentry-debug-meta.properties", "sentry-external-modules.txt")
270258
include(endings.map { "**/*.$it" })

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ license {
159159
style["flex"] = HeaderStyle.BLOCK_COMMENT.format
160160
style["bnf"] = HeaderStyle.BLOCK_COMMENT.format
161161

162-
val endings = listOf("java", "kt", "kts", "groovy", "gradle.kts", "xml", "properties", "html", "flex", "bnf")
162+
val endings = listOf("java", "kt", "kts", "gradle.kts", "xml", "properties", "html", "flex", "bnf")
163163
include(endings.map { "**/*.$it" })
164164
}
165165

changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Minecraft Development for IntelliJ
22

3+
## [1.8.19]
4+
5+
### Fixed
6+
7+
- NeoForged ModDev Gradle sync failing on IntelliJ 2026.2
8+
39
## [1.8.18]
410

511
### Fixed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1g
2323

2424
ideaVersionName = 2026.2
2525

26-
coreVersion = 1.8.18
26+
coreVersion = 1.8.19
2727

2828
# Silences a build-time warning because we are bundling our own kotlin library
2929
kotlin.stdlib.default.dependency = false

gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1"
5353
# Search for com.jetbrains.intellij.gradle
5454
gradleToolingExtension = { module = "com.jetbrains.intellij.gradle:gradle-tooling-extension", version = "262.8665.258" }
5555
annotations = "org.jetbrains:annotations:26.1.0"
56-
groovy = "org.codehaus.groovy:groovy:3.0.25"
5756

5857
asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
5958
asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Minecraft Development for IntelliJ
3131
</tr>
3232
</table>
3333

34-
Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.17-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
34+
Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.8.19-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
3535
----------------------
3636

3737
<a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG2BuilderImpl.groovy

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3BuilderImpl.groovy

Lines changed: 0 additions & 83 deletions
This file was deleted.

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3Impl.groovy

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModelBuilderImpl.groovy

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)