User: kyle wood
Date: 21 Jul 26 01:38
Revision: c02db4ef6c2fba11b95e48e3e73feb69f808771c
Summary:
Merge branch '2025.3' into 2026.1


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 33f8e8f1a420f57b06f46c5404beb37b4e220a26)
+++ build.gradle.kts	(revision c02db4ef6c2fba11b95e48e3e73feb69f808771c)
@@ -26,11 +26,9 @@
 import org.jetbrains.gradle.ext.settings
 import org.jetbrains.gradle.ext.taskTriggers
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
-import org.jetbrains.intellij.platform.gradle.tasks.CleanSandboxTask
 import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
 
 plugins {
-    groovy
     id(libs.plugins.changelog.get().pluginId)
     alias(libs.plugins.idea.ext)
     `mcdev-core`
@@ -153,9 +151,6 @@
     }
     testLibs(projects.mixinTestData)
 
-    // For non-SNAPSHOT versions (unless Jetbrains fixes this...) find the version with:
-    // afterEvaluate { println(intellijPlatform.productInfo.buildNumber) }
-    gradleToolingExtension(libs.groovy)
     gradleToolingExtension(libs.gradleToolingExtension)
     gradleToolingExtension(libs.annotations)
 }
@@ -188,11 +183,6 @@
     options.release = 8
     options.compilerArgs = listOf("-Xlint:-options")
 }
-tasks.withType<GroovyCompile>().configureEach {
-    options.compilerArgs = listOf("-proc:none")
-    sourceCompatibility = "1.8"
-    targetCompatibility = "1.8"
-}
 
 tasks.processResources {
     // These templates aren't allowed to be in a directory structure in the output jar
@@ -263,7 +253,7 @@
 }
 
 license {
-    val endings = listOf("java", "kt", "kts", "groovy", "gradle.kts", "xml", "properties", "html", "flex", "bnf")
+    val endings = listOf("java", "kt", "kts", "gradle.kts", "xml", "properties", "html", "flex", "bnf")
     exclude("META-INF/plugin.xml") // https://youtrack.jetbrains.com/issue/IDEA-345026
     exclude("sentry-debug-meta.properties", "sentry-external-modules.txt")
     include(endings.map { "**/*.$it" })
Index: gradle.properties
===================================================================
--- gradle.properties	(revision 33f8e8f1a420f57b06f46c5404beb37b4e220a26)
+++ gradle.properties	(revision c02db4ef6c2fba11b95e48e3e73feb69f808771c)
@@ -23,7 +23,7 @@
 
 ideaVersionName = 2026.1
 
-coreVersion = 1.8.18
+coreVersion = 1.8.19
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision 33f8e8f1a420f57b06f46c5404beb37b4e220a26)
+++ gradle/libs.versions.toml	(revision c02db4ef6c2fba11b95e48e3e73feb69f808771c)
@@ -53,7 +53,6 @@
 # Search for com.jetbrains.intellij.gradle
 gradleToolingExtension = { module = "com.jetbrains.intellij.gradle:gradle-tooling-extension", version = "253.29346.138" }
 annotations = "org.jetbrains:annotations:26.1.0"
-groovy = "org.codehaus.groovy:groovy:3.0.25"
 
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
 asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }