User: joe
Date: 15 Nov 26 06:40
Revision: ab9b113818031149dd375e4440236b96bc90b475
Summary:
Merge branch 'dev' into annotater


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 634ba2a6b272ca2ed4475f6cdb19ac28d8a54d3d)
+++ build.gradle.kts	(revision ab9b113818031149dd375e4440236b96bc90b475)
@@ -19,8 +19,6 @@
  */
 
 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
@@ -37,10 +35,10 @@
     alias(libs.plugins.sentry) apply (System.getenv("CI") == "true" && System.getenv("NO_SENTRY") != "true")
 }
 
-val coreVersion: String by project
+val coreVersion = project.property("coreVersion") as String
 
-val gradleToolingExtension: Configuration by configurations.creating
-val testLibs: Configuration by configurations.creating {
+val gradleToolingExtension = configurations.create("gradleToolingExtension")
+val testLibs = configurations.create("testLibs") {
     isTransitive = false
 }
 
@@ -52,6 +50,7 @@
     }
 })
 val gradleToolingExtensionJar = tasks.register<Jar>(gradleToolingExtensionSourceSet.jarTaskName) {
+    description = "Package Gradle tooling extension jar"
     from(gradleToolingExtensionSourceSet.output)
     archiveClassifier.set("gradle-tooling-extension")
     exclude("META-INF/plugin.xml")
@@ -78,6 +77,7 @@
 }
 
 val externalAnnotationsJar = tasks.register<Jar>("externalAnnotationsJar") {
+    description = "Package external annotations jar"
     from("externalAnnotations")
     destinationDirectory.set(layout.buildDirectory.dir("externalAnnotations"))
     archiveFileName.set("externalAnnotations.jar")
@@ -95,10 +95,6 @@
     implementation(libs.mappingIo)
     implementation(libs.bundles.asm)
 
-    implementation(libs.bundles.fuel) {
-        exclude(group = "org.jetbrains.kotlin")
-        exclude(group = "org.jetbrains.kotlinx")
-    }
     implementation(libs.sentry) {
         exclude(group = "org.slf4j")
     }
@@ -203,6 +199,7 @@
 val sandboxTestTasks = mutableListOf<TaskProvider<PrepareSandboxTask>>()
 repeat(testForks) {
     sandboxTestTasks += tasks.register<PrepareSandboxTask>("prepareTestSandboxFork$it") {
+        description = "Prepare sandbox for test fork #$it"
         sandboxSuffix.set("-fork-$it")
         doFirst {
             sandboxDirectory.get().asFile.listFiles()
@@ -219,7 +216,8 @@
     }
 }
 
-val cleanTestSandboxForks by tasks.registering(Delete::class) {
+val cleanTestSandboxForks = tasks.register("cleanTestSandboxForks", Delete::class) {
+    description = "Delete all test fork sandboxes"
     doFirst {
         tasks.prepareTestSandbox.flatMap { it.sandboxDirectory }
             .get().asFile.listFiles()
@@ -266,6 +264,7 @@
             .startsWith("src/test/resources")
     }
 
+    @Suppress("UnstableApiUsage")
     tasks {
         register("gradle") {
             files.from(
@@ -300,29 +299,30 @@
     }
 }
 
-val generateAtLexer by lexer("AtLexer", "com/demonwav/mcdev/platform/minecraft/at/gen")
-val generateAtParser by parser("AtParser", "com/demonwav/mcdev/platform/minecraft/at/gen")
+val generateAtLexer = lexer("generateAtLexer", "AtLexer", "com/demonwav/mcdev/platform/minecraft/at/gen")
+val generateAtParser = parser("generateAtParser", "AtParser", "com/demonwav/mcdev/platform/minecraft/at/gen")
 
-val generateCtLexer by lexer("CtLexer", "com/demonwav/mcdev/platform/minecraft/ct/gen")
-val generateCtParser by parser("CtParser", "com/demonwav/mcdev/platform/minecraft/ct/gen")
+val generateCtLexer = lexer("generateCtLexer", "CtLexer", "com/demonwav/mcdev/platform/minecraft/ct/gen")
+val generateCtParser = parser("generateCtParser", "CtParser", "com/demonwav/mcdev/platform/minecraft/ct/gen")
 
-val generateNbttLexer by lexer("NbttLexer", "com/demonwav/mcdev/nbt/lang/gen")
-val generateNbttParser by parser("NbttParser", "com/demonwav/mcdev/nbt/lang/gen")
+val generateNbttLexer = lexer("generateNbttLexer", "NbttLexer", "com/demonwav/mcdev/nbt/lang/gen")
+val generateNbttParser = parser("generateNbttParser", "NbttParser", "com/demonwav/mcdev/nbt/lang/gen")
 
-val generateLangLexer by lexer("LangLexer", "com/demonwav/mcdev/translations/lang/gen")
-val generateLangParser by parser("LangParser", "com/demonwav/mcdev/translations/lang/gen")
+val generateLangLexer = lexer("generateLangLexer", "LangLexer", "com/demonwav/mcdev/translations/lang/gen")
+val generateLangParser = parser("generateLangParser", "LangParser", "com/demonwav/mcdev/translations/lang/gen")
 
-val generateMEExpressionLexer by lexer("MEExpressionLexer", "com/demonwav/mcdev/platform/mixin/expression/gen")
-val generateMEExpressionParser by parser("MEExpressionParser", "com/demonwav/mcdev/platform/mixin/expression/gen")
+val generateMEExpressionLexer = lexer("generateMEExpressionLexer", "MEExpressionLexer", "com/demonwav/mcdev/platform/mixin/expression/gen")
+val generateMEExpressionParser = parser("generateMEExpressionParser", "MEExpressionParser", "com/demonwav/mcdev/platform/mixin/expression/gen")
 
-val generateTranslationTemplateLexer by lexer(
+val generateTranslationTemplateLexer = lexer(
+    "generateTranslationTemplateLexer",
     "TranslationTemplateLexer",
     "com/demonwav/mcdev/translations/template/gen"
 )
 
-val generate by tasks.registering {
+val generate = tasks.register("generate") {
     group = "minecraft"
-    description = "Generates sources needed to compile the plugin."
+    description = "Generate sources needed to compile the plugin."
     outputs.dir(layout.buildDirectory.dir("gen"))
     dependsOn(
         generateAtLexer,
Index: buildSrc/src/main/kotlin/mcdev-core.gradle.kts
===================================================================
--- buildSrc/src/main/kotlin/mcdev-core.gradle.kts	(revision 634ba2a6b272ca2ed4475f6cdb19ac28d8a54d3d)
+++ buildSrc/src/main/kotlin/mcdev-core.gradle.kts	(revision ab9b113818031149dd375e4440236b96bc90b475)
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import gradle.kotlin.dsl.accessors._74e4e57ecc86fc3500a89165855e3ea0.versionCatalogs
 import org.cadixdev.gradle.licenser.header.HeaderStyle
 import org.cadixdev.gradle.licenser.tasks.LicenseTask
-import org.gradle.accessors.dm.LibrariesForLibs
 import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
@@ -34,9 +34,9 @@
     id("net.neoforged.licenser")
 }
 
-val ideaVersionName: String by project
-val coreVersion: String by project
-val buildNumber: String? by project
+val ideaVersionName = project.property("ideaVersionName") as String
+val coreVersion = project.property("coreVersion") as String
+val buildNumber = project.findProperty("buildNumber") as String?
 
 version = "$ideaVersionName-$coreVersion"
 
@@ -108,20 +108,20 @@
     maven("https://repo.denwav.dev/repository/maven-public/")
 }
 
-val libs = the<LibrariesForLibs>()
+val libs = versionCatalogs.named("libs")
 dependencies {
-    compileOnly(libs.kotlin.stdlib)
-    compileOnly(libs.kotlin.reflect)
-    compileOnly(libs.annotations)
-    implementation(libs.bundles.coroutines) {
+    compileOnly(libs.findLibrary("kotlin.stdlib").get())
+    compileOnly(libs.findLibrary("kotlin.reflect").get())
+    compileOnly(libs.findLibrary("annotations").get())
+    implementation(libs.findBundle("coroutines").get()) {
         exclude(module = "kotlinx-coroutines-core-jvm")
         exclude(group = "org.jetbrains.kotlin")
     }
 
-    testImplementation(libs.junit.api)
-    testImplementation(libs.junit.vintage) // Hack to get tests to compile and run
-    testRuntimeOnly(libs.junit.engine)
-    testRuntimeOnly(libs.junit.platform.launcher)
+    testImplementation(libs.findLibrary("junit.api").get())
+    testImplementation(libs.findLibrary("junit.vintage").get()) // Hack to get tests to compile and run
+    testRuntimeOnly(libs.findLibrary("junit.engine").get())
+    testRuntimeOnly(libs.findLibrary("junit.platform.launcher").get())
 }
 
 intellijPlatform {
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision 634ba2a6b272ca2ed4475f6cdb19ac28d8a54d3d)
+++ gradle/libs.versions.toml	(revision ab9b113818031149dd375e4440236b96bc90b475)
@@ -5,11 +5,10 @@
 coroutines = "1.10.2"
 junit = "6.0.3"
 asm = "9.9.1"
-fuel = "2.3.1"
 licenser = "0.7.5"
 changelog = "2.5.0"
 # https://github.com/JetBrains/intellij-platform-gradle-plugin
-intellij-plugin = "2.13.1"
+intellij-plugin = "2.20.1"
 # https://central.sonatype.com/artifact/org.jetbrains.intellij/plugin-repository-rest-client
 intellij-plugin-repository-rest-client = "2.0.50"
 # https://www.jetbrains.com/intellij-repository/snapshots or https://www.jetbrains.com/intellij-repository/releases/
@@ -62,9 +61,6 @@
 gson = "com.google.code.gson:gson:2.13.2"
 jspecify = "org.jspecify:jspecify:1.0.0"
 
-fuel = { module = "com.github.kittinunf.fuel:fuel", version.ref = "fuel" }
-fuel-coroutines = { module = "com.github.kittinunf.fuel:fuel-coroutines", version.ref = "fuel" }
-
 sentry = "io.sentry:sentry:8.37.1"
 
 # Testing
@@ -85,4 +81,3 @@
 [bundles]
 coroutines = ["coroutines-swing"]
 asm = ["asm", "asm-tree", "asm-analysis", "asm-util"]
-fuel = ["fuel", "fuel-coroutines"]