From 0eb661f14d9880585ea6c0dc1b8e8168586f27f8 Mon Sep 17 00:00:00 2001 From: Brian Neumann-Fopiano Date: Wed, 21 Oct 2026 08:24:55 -0400 Subject: [PATCH] Trimmed unused build work - Limited SlimJar generation to shaded core artifacts - Honored configured mod test fork limits - Set Forge targets to four test JVMs --- core/build.gradle | 13 +++++++++++-- gradle/modded-version-sources.gradle | 4 ++-- gradle/multiplexor.gradle | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 4ca0f56b9..ba53e472a 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,4 +1,5 @@ import groovy.json.JsonSlurper +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import io.github.slimjar.resolver.data.Mirror import org.gradle.api.attributes.java.TargetJvmVersion import org.gradle.api.file.FileTreeElement @@ -198,8 +199,16 @@ slimJar { } } +TaskProvider slimJarTask = tasks.named('slimJar') +tasks.withType(ShadowJar).configureEach { + dependsOn(slimJarTask) +} + def embeddedAgentJar = project(':core:agent').tasks.named('jar', Jar) -tasks.named('processResources').configure { +tasks.named('processResources').configure { Task resources -> + resources.setFinalizedBy(resources.finalizedBy.getDependencies(resources).findAll { Task finalizer -> + finalizer != slimJarTask.get() + }) from(embeddedAgentJar.map { it.archiveFile }) { rename { String ignored -> 'agent.jar' } } @@ -460,7 +469,7 @@ List dependencyBuildMetadata = [ String languageTomlSupportClassPattern = 'art/arcane/volmlib/util/config/(?:TomlCodec|ConfigJson|ConfigExposePolicy|ConfigDoc|ConfigDescription|ConfigDocumentation)(?:\\$[^/]+)?\\.class' -tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar).configure { +tasks.named('shadowJar', ShadowJar).configure { inputs.property('languageTomlSupportClassPattern', languageTomlSupportClassPattern) dependsOn(embeddedAgentJar) mergeServiceFiles() diff --git a/gradle/modded-version-sources.gradle b/gradle/modded-version-sources.gradle index 2d1458186..9045b75b1 100644 --- a/gradle/modded-version-sources.gradle +++ b/gradle/modded-version-sources.gradle @@ -8,8 +8,8 @@ tasks.named('compileTestJava', JavaCompile).configure { options.release.set((int) irisModTarget.java) } tasks.withType(Test).configureEach { - maxParallelForks = Math.min(2, Math.min(Runtime.runtime.availableProcessors(), - Math.min(gradle.startParameter.maxWorkerCount, testForks))) + maxParallelForks = Math.min(Runtime.runtime.availableProcessors(), + Math.min(gradle.startParameter.maxWorkerCount, testForks)) if (gradle.extensions.extraProperties.has('irisBuildLane')) { jvmArgs('-XX:ParallelGCThreads=2', '-XX:ConcGCThreads=1', '-XX:CICompilerCount=2') } diff --git a/gradle/multiplexor.gradle b/gradle/multiplexor.gradle index a43e29fca..e0ec80cf7 100644 --- a/gradle/multiplexor.gradle +++ b/gradle/multiplexor.gradle @@ -60,7 +60,7 @@ gradle.projectsEvaluated { buildTargets.add([ id: "${loader}-${minecraft}".toString(), tasks: [":verify${label}${minecraft.replace('.', '_')}".toString()], - arguments: ['-PmoddedBuildParallelism=1', "-PmoddedTestForks=${forge ? 2 : 1}".toString(), + arguments: ['-PmoddedBuildParallelism=1', "-PmoddedTestForks=${forge ? 4 : 1}".toString(), '-PmultiplexorSandbox=true'], java: 25, memoryMiB: forge ? 16384 : 8192,