mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-26 05:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reviewed Forge cache persistence

Browse Source 
- Isolated Forge targets retain generated Minecraft dependencies in their private Gradle homes
This commit is contained in:
Brian Neumann-Fopiano committed 2026-10-21 06:22:45 -04:00
2 parents 9add1a0fa6 20ff08aeb7
commit 97da131884
2 files changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

adapters/forge/build.gradle
+5 -2
View File
@@ -66,10 +66,13 @@ String forgeVersion = providers.gradleProperty('forgeVersion').getOrElse(irisMod
String buildLane = gradle.extensions.extraProperties.has('irisBuildLane') String buildLane = gradle.extensions.extraProperties.has('irisBuildLane')
? gradle.extensions.extraProperties.get('irisBuildLane').toString() : null ? gradle.extensions.extraProperties.get('irisBuildLane').toString() : null
if (buildLane != null) { if (buildLane != null) {
File laneCache = providers.gradleProperty('multiplexorSandbox').getOrElse('false').toBoolean()
? new File(gradle.gradleUserHomeDir, "caches/iris-forge/${buildLane}")
: file(".gradle/iris-lanes/${buildLane}")
plugins.withType(EnhancedPlugin).configureEach { EnhancedPlugin<?> forgePlugin -> plugins.withType(EnhancedPlugin).configureEach { EnhancedPlugin<?> forgePlugin ->
forgePlugin.globalCaches().set(layout.projectDirectory.dir(".gradle/iris-lanes/${buildLane}/forgegradle")) forgePlugin.globalCaches().set(new File(laneCache, 'forgegradle'))
} }
minecraft.mavenizerOutput.set(layout.projectDirectory.dir(".gradle/iris-lanes/${buildLane}/mavenizer/repo")) minecraft.mavenizerOutput.set(new File(laneCache, 'mavenizer/repo'))
} }
Closure<String> loaderDisplayVersion = { String loaderVersion -> Closure<String> loaderDisplayVersion = { String loaderVersion ->
String coordinatePrefix = "${minecraftVersion}-" String coordinatePrefix = "${minecraftVersion}-"
build.gradle
+1 -1
View File
@@ -334,7 +334,7 @@ Provider<IrisModdedBuildService> matrixWorkers = gradle.sharedServices.registerI
} }
List<String> nestedBuildArguments = [gradle.startParameter.buildCacheEnabled ? '--build-cache' : '--no-build-cache'] List<String> nestedBuildArguments = [gradle.startParameter.buildCacheEnabled ? '--build-cache' : '--no-build-cache']
if (providers.gradleProperty('multiplexorSandbox').getOrElse('false').toBoolean()) { if (providers.gradleProperty('multiplexorSandbox').getOrElse('false').toBoolean()) {
nestedBuildArguments.add('--no-daemon') nestedBuildArguments.addAll(['--no-daemon', '-PmultiplexorSandbox=true'])
} }
String nestedJvmArguments = providers.gradleProperty('org.gradle.jvmargs').getOrElse('') + String nestedJvmArguments = providers.gradleProperty('org.gradle.jvmargs').getOrElse('') +
' -XX:ActiveProcessorCount=2' ' -XX:ActiveProcessorCount=2'