User: joe Date: 16 Nov 26 02:37 Revision: abbfb094216110cc6732e5653fd8472a6fc57ed1 Summary: Merge branch '2026.1' into 2026.2 # Conflicts: # build.gradle.kts # gradle/libs.versions.toml TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10797&personal=false Index: build.gradle.kts =================================================================== --- build.gradle.kts (revision d89d461b1eb18d4a1bee68f81204fbd6ee304e6f) +++ build.gradle.kts (revision abbfb094216110cc6732e5653fd8472a6fc57ed1) @@ -35,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 } @@ -50,6 +50,7 @@ } }) val gradleToolingExtensionJar = tasks.register(gradleToolingExtensionSourceSet.jarTaskName) { + description = "Package Gradle tooling extension jar" from(gradleToolingExtensionSourceSet.output) archiveClassifier.set("gradle-tooling-extension") exclude("META-INF/plugin.xml") @@ -75,7 +76,92 @@ } } +// Code shared by the test source sets: the HTTP mock server, its fixture loader, and the fixture recorder +val testSupportSourceSet: SourceSet = sourceSets.create("testSupport") +val httpFixtureRecorder = configurations.create("httpFixtureRecorder") + +val httpFixturesDir: Directory = layout.projectDirectory.dir("src/test/resources/http-fixtures") +val generatedHttpFixturesDir: Provider = layout.buildDirectory.dir("http-fixtures-generated") + +// The builtin template provider downloads https://github.com/minecraft-dev/templates/archive/refs/heads/v.zip. +// Rather than recording it, zip the pinned templates checkout the same way GitHub does, so the mock server always +// serves the templates the tests run against. +val builtinTemplatesFormatVersion = Regex("""branch\s*=\s*v(\d+)""") + .find(file(".gitmodules").readText())?.groupValues?.get(1) + ?: throw GradleException("Couldn't find the templates branch in .gitmodules") +val builtinTemplatesHttpFixture = tasks.register("builtinTemplatesHttpFixture") { + description = "Zip the templates checkout as the HTTP mock server's copy of the builtin template download" + val version = builtinTemplatesFormatVersion + val path = "github.com/minecraft-dev/templates/archive/refs/heads/v$version.zip" + val root = generatedHttpFixturesDir + val mapping = root.map { it.file("mappings/$path.json") } + + from("templates") { + exclude(".git") + into("templates-$version") + } + val destination = root.map { it.dir("__files/${path.substringBeforeLast('/')}") } + destinationDirectory.set(destination) + archiveFileName.set(path.substringAfterLast('/')) + isPreserveFileTimestamps = false + isReproducibleFileOrder = true + + // The same WireMock mapping the recorder would write + outputs.file(mapping) + // Clear out the files for an older templates format version + doFirst { + root.get().asFile.deleteRecursively() + destination.get().asFile.mkdirs() + } + doLast { + mapping.get().asFile.apply { + parentFile.mkdirs() + writeText( + """ + |{ + | "name": "https://$path", + | "request": { + | "method": "GET", + | "url": "/$path" + | }, + | "response": { + | "status": 200, + | "bodyFileName": "$path", + | "headers": { + | "Content-Type": "application/zip" + | } + | } + |} + |""".trimMargin() + ) + } + } +} + +tasks.register("recordHttpFixtures") { + group = "minecraft" + description = "Record the creator's HTTP fixtures from the live services. " + + "Pass -Pmcdev.recordFilter=, to only record URLs containing one of those strings." + // The recorder uses a few platform-free classes from the plugin, such as NpmRegistry + classpath(testSupportSourceSet.output, sourceSets.main.get().output, httpFixtureRecorder) + mainClass.set("com.demonwav.mcdev.framework.http.recorder.HttpFixtureRecorder") + val filters = providers.gradleProperty("mcdev.recordFilter") + val templatesDir = file("templates") + val stagingDir = temporaryDir.resolve("http-fixtures") + argumentProviders += CommandLineArgumentProvider { + listOf( + httpFixturesDir.asFile.absolutePath, + "--templates", + templatesDir.absolutePath, + "--staging", + stagingDir.absolutePath, + ) + + filters.orNull?.split(',')?.map { it.trim() }?.filter { it.isNotEmpty() }.orEmpty() + } +} + val externalAnnotationsJar = tasks.register("externalAnnotationsJar") { + description = "Package external annotations jar" from("externalAnnotations") destinationDirectory.set(layout.buildDirectory.dir("externalAnnotations")) archiveFileName.set("externalAnnotations.jar") @@ -93,10 +179,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") } @@ -125,6 +207,7 @@ bundledPlugin("org.jetbrains.kotlin") bundledPlugin("org.toml.lang") bundledPlugin("org.jetbrains.plugins.yaml") + bundledPlugin("org.jetbrains.plugins.github") testFramework(TestFrameworkType.JUnit5) testFramework(TestFrameworkType.Platform) @@ -149,6 +232,17 @@ } testLibs(projects.mixinTestData) + // The IDE provides these at test time, the recorder runs outside it and needs its own + "testSupportCompileOnly"(libs.kotlin.stdlib) + "testSupportCompileOnly"(libs.gson) + "testSupportCompileOnly"(libs.junit.api) + "testSupportCompileOnly"(sourceSets.main.get().output) + "testSupportImplementation"(libs.wiremock) + testImplementation(testSupportSourceSet.output) + testImplementation(libs.wiremock) + httpFixtureRecorder(libs.kotlin.stdlib) + httpFixtureRecorder(libs.gson) + gradleToolingExtension(gradleApi()) gradleToolingExtension(libs.gradleToolingExtension) gradleToolingExtension(libs.annotations) @@ -201,6 +295,7 @@ val sandboxTestTasks = mutableListOf>() repeat(testForks) { sandboxTestTasks += tasks.register("prepareTestSandboxFork$it") { + description = "Prepare sandbox for test fork #$it" sandboxSuffix.set("-fork-$it") doFirst { sandboxDirectory.get().asFile.listFiles() @@ -217,7 +312,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() @@ -235,6 +331,16 @@ systemProperty("NO_FS_ROOTS_ACCESS_CHECK", "true") systemProperty("java.awt.headless", "true") + dependsOn(builtinTemplatesHttpFixture) + inputs.files(builtinTemplatesHttpFixture).withPropertyName("builtinTemplatesHttpFixture") + systemProperty( + "mcdev.test.httpFixtures", + listOf(httpFixturesDir.asFile, generatedHttpFixturesDir.get().asFile).joinToString(File.pathSeparator), + ) + // Outside HttpMockExtension, the plugin's requests go to a closed loopback port and fail with "connection refused" + // instead of reaching the real services + systemProperty("mcdev.test.httpMock", "http://127.0.0.1:1") + jvmArgs( "-Dsun.io.useCanonCaches=false", "-Dsun.io.useCanonPrefixCache=false", @@ -264,6 +370,7 @@ .startsWith("src/test/resources") } + @Suppress("UnstableApiUsage") tasks { register("gradle") { files.from( @@ -298,29 +405,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 d89d461b1eb18d4a1bee68f81204fbd6ee304e6f) +++ buildSrc/src/main/kotlin/mcdev-core.gradle.kts (revision abbfb094216110cc6732e5653fd8472a6fc57ed1) @@ -18,9 +18,9 @@ * along with this program. If not, see . */ +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() +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 { @@ -193,6 +193,7 @@ tasks.runIde { maxHeapSize = "2G" jvmArgs("--add-exports=java.base/jdk.internal.vm=ALL-UNNAMED") + systemProperty("mcdev.annotater.upstream", "Set the mcdev.annotater.upstream system property") } tasks.test { Index: gradle.properties =================================================================== --- gradle.properties (revision d89d461b1eb18d4a1bee68f81204fbd6ee304e6f) +++ gradle.properties (revision abbfb094216110cc6732e5653fd8472a6fc57ed1) @@ -25,9 +25,6 @@ coreVersion = 1.9.1 -# Silences a build-time warning because we are bundling our own kotlin library -kotlin.stdlib.default.dependency = false - org.gradle.parallel=true org.gradle.caching=true Index: gradle/libs.versions.toml =================================================================== --- gradle/libs.versions.toml (revision d89d461b1eb18d4a1bee68f81204fbd6ee304e6f) +++ gradle/libs.versions.toml (revision abbfb094216110cc6732e5653fd8472a6fc57ed1) @@ -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.18.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.51" # https://www.jetbrains.com/intellij-repository/snapshots or https://www.jetbrains.com/intellij-repository/releases/ @@ -39,7 +38,7 @@ coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" } -mappingIo = "net.fabricmc:mapping-io:0.8.0" +mappingIo = "net.fabricmc:mapping-io:0.9.2" mixinExtras-expressions = "io.github.llamalad7:mixinextras-expressions:0.0.6" jgraphx = "com.github.vlsi.mxgraph:jgraphx:4.2.2" @@ -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 @@ -80,9 +76,11 @@ junit-vintage = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit" } junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit" } +# Shaded, so its Jetty and Jackson can't clash with the IDE's +wiremock = "org.wiremock:wiremock-standalone:3.13.2" + mixinExtras-common = "io.github.llamalad7:mixinextras-common:0.5.3" [bundles] coroutines = ["coroutines-swing"] asm = ["asm", "asm-tree", "asm-analysis", "asm-util"] -fuel = ["fuel", "fuel-coroutines"]