User: kyle wood
Date: 21 Jul 26 01:44
Revision: 8c200014500de3a92ff1f02f2e7a73a76376a16c
Summary:
Merge branch '2026.1' into 2026.2


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision e99d90ffcf92bd2fd97fa7dcb74ee925a598c37c)
+++ build.gradle.kts	(revision 8c200014500de3a92ff1f02f2e7a73a76376a16c)
@@ -19,18 +19,14 @@
  */
 
 import io.sentry.android.gradle.extensions.SentryPluginExtension
-import java.util.concurrent.atomic.AtomicInteger
-import kotlin.concurrent.atomics.AtomicInt
 import org.gradle.kotlin.dsl.configure
 import org.jetbrains.changelog.Changelog
 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,10 +149,7 @@
     }
     testLibs(projects.mixinTestData)
 
-    // 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)
 }
@@ -189,11 +182,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
@@ -264,7 +252,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: buildSrc/src/main/kotlin/mcdev-core.gradle.kts
===================================================================
--- buildSrc/src/main/kotlin/mcdev-core.gradle.kts	(revision e99d90ffcf92bd2fd97fa7dcb74ee925a598c37c)
+++ buildSrc/src/main/kotlin/mcdev-core.gradle.kts	(revision 8c200014500de3a92ff1f02f2e7a73a76376a16c)
@@ -159,7 +159,7 @@
     style["flex"] = HeaderStyle.BLOCK_COMMENT.format
     style["bnf"] = HeaderStyle.BLOCK_COMMENT.format
 
-    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")
     include(endings.map { "**/*.$it" })
 }
 
Index: gradle.properties
===================================================================
--- gradle.properties	(revision e99d90ffcf92bd2fd97fa7dcb74ee925a598c37c)
+++ gradle.properties	(revision 8c200014500de3a92ff1f02f2e7a73a76376a16c)
@@ -23,7 +23,7 @@
 
 ideaVersionName = 2026.2
 
-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 e99d90ffcf92bd2fd97fa7dcb74ee925a598c37c)
+++ gradle/libs.versions.toml	(revision 8c200014500de3a92ff1f02f2e7a73a76376a16c)
@@ -53,7 +53,6 @@
 # Search for com.jetbrains.intellij.gradle
 gradleToolingExtension = { module = "com.jetbrains.intellij.gradle:gradle-tooling-extension", version = "262.8665.258" }
 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" }
Index: readme.md
===================================================================
--- readme.md	(revision e99d90ffcf92bd2fd97fa7dcb74ee925a598c37c)
+++ readme.md	(revision 8c200014500de3a92ff1f02f2e7a73a76376a16c)
@@ -31,7 +31,7 @@
     </tr>
 </table>
 
-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)
+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)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>