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

fix builds

Browse Source
This commit is contained in:
Brian Neumann-Fopiano committed 2026-09-23 08:02:16 -04:00
1 parent ca9f28c9b0
commit 7986698c1c
1 file changed
+23 -10
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+23 -10
View File
@@ -368,6 +368,7 @@ if (localVolmLibCheckout != null) {
Closure<Void> declareModdedJarIo = { Exec task, String adapter, String artifactName, Map<String, String> versions -> Closure<Void> declareModdedJarIo = { Exec task, String adapter, String artifactName, Map<String, String> versions ->
task.inputs.files(moddedSharedInputs).withPropertyName('moddedSharedSources') task.inputs.files(moddedSharedInputs).withPropertyName('moddedSharedSources')
.withPathSensitivity(PathSensitivity.RELATIVE)
task.inputs.files( task.inputs.files(
layout.projectDirectory.file("adapters/${adapter}/src").asFile, layout.projectDirectory.file("adapters/${adapter}/src").asFile,
layout.projectDirectory.file("adapters/${adapter}/build.gradle").asFile, layout.projectDirectory.file("adapters/${adapter}/build.gradle").asFile,
@@ -376,7 +377,6 @@ Closure<Void> declareModdedJarIo = { Exec task, String adapter, String artifactN
versions.each { String key, String value -> task.inputs.property(key, value) } versions.each { String key, String value -> task.inputs.property(key, value) }
task.inputs.property('useLocalVolmLib', useLocalVolmLib) task.inputs.property('useLocalVolmLib', useLocalVolmLib)
task.inputs.property('volmLibCoordinate', volmLibCoordinate) task.inputs.property('volmLibCoordinate', volmLibCoordinate)
task.inputs.property('localVolmLibCheckout', localVolmLibCheckout == null ? '' : localVolmLibCheckout.absolutePath)
task.outputs.file(layout.projectDirectory.file("adapters/${adapter}/build/libs/${artifactName}")) task.outputs.file(layout.projectDirectory.file("adapters/${adapter}/build/libs/${artifactName}"))
return null return null
} }
@@ -395,8 +395,8 @@ tasks.register('fabricJar', Exec) {
"-PuseLocalVolmLib=${useLocalVolmLib}", "-PuseLocalVolmLib=${useLocalVolmLib}",
"-PvolmLibCoordinate=${volmLibCoordinate}" "-PvolmLibCoordinate=${volmLibCoordinate}"
] ]
if (localVolmLibDirectory != null && !localVolmLibDirectory.isBlank()) { if (localVolmLibCheckout != null) {
command.add("-PlocalVolmLibDirectory=${localVolmLibDirectory}") environment('ORG_GRADLE_PROJECT_localVolmLibDirectory', localVolmLibCheckout.absolutePath)
} }
commandLine(command) commandLine(command)
declareModdedJarIo(it, 'fabric', fabricArtifactName, [ declareModdedJarIo(it, 'fabric', fabricArtifactName, [
@@ -433,8 +433,8 @@ tasks.register('forgeJar', Exec) {
"-PuseLocalVolmLib=${useLocalVolmLib}", "-PuseLocalVolmLib=${useLocalVolmLib}",
"-PvolmLibCoordinate=${volmLibCoordinate}" "-PvolmLibCoordinate=${volmLibCoordinate}"
] ]
if (localVolmLibDirectory != null && !localVolmLibDirectory.isBlank()) { if (localVolmLibCheckout != null) {
command.add("-PlocalVolmLibDirectory=${localVolmLibDirectory}") environment('ORG_GRADLE_PROJECT_localVolmLibDirectory', localVolmLibCheckout.absolutePath)
} }
commandLine(command) commandLine(command)
declareModdedJarIo(it, 'forge', forgeArtifactName, [ declareModdedJarIo(it, 'forge', forgeArtifactName, [
@@ -471,8 +471,8 @@ tasks.register('neoforgeJar', Exec) {
"-PuseLocalVolmLib=${useLocalVolmLib}", "-PuseLocalVolmLib=${useLocalVolmLib}",
"-PvolmLibCoordinate=${volmLibCoordinate}" "-PvolmLibCoordinate=${volmLibCoordinate}"
] ]
if (localVolmLibDirectory != null && !localVolmLibDirectory.isBlank()) { if (localVolmLibCheckout != null) {
command.add("-PlocalVolmLibDirectory=${localVolmLibDirectory}") environment('ORG_GRADLE_PROJECT_localVolmLibDirectory', localVolmLibCheckout.absolutePath)
} }
commandLine(command) commandLine(command)
declareModdedJarIo(it, 'neoforge', neoForgeArtifactName, [ declareModdedJarIo(it, 'neoforge', neoForgeArtifactName, [
@@ -529,11 +529,12 @@ tasks.register('moddedTest', Exec) {
"-PuseLocalVolmLib=${useLocalVolmLib}", "-PuseLocalVolmLib=${useLocalVolmLib}",
"-PvolmLibCoordinate=${volmLibCoordinate}" "-PvolmLibCoordinate=${volmLibCoordinate}"
] ]
if (localVolmLibDirectory != null && !localVolmLibDirectory.isBlank()) { if (localVolmLibCheckout != null) {
command.add("-PlocalVolmLibDirectory=${localVolmLibDirectory}") environment('ORG_GRADLE_PROJECT_localVolmLibDirectory', localVolmLibCheckout.absolutePath)
} }
commandLine(command) commandLine(command)
inputs.files(moddedSharedInputs).withPropertyName('moddedSharedSources') inputs.files(moddedSharedInputs).withPropertyName('moddedSharedSources')
.withPathSensitivity(PathSensitivity.RELATIVE)
inputs.files( inputs.files(
layout.projectDirectory.file('adapters/fabric/src').asFile, layout.projectDirectory.file('adapters/fabric/src').asFile,
layout.projectDirectory.file('adapters/fabric/build.gradle').asFile, layout.projectDirectory.file('adapters/fabric/build.gradle').asFile,
@@ -544,7 +545,6 @@ tasks.register('moddedTest', Exec) {
inputs.property('fabricLoaderVersion', fabricLoaderVersion) inputs.property('fabricLoaderVersion', fabricLoaderVersion)
inputs.property('useLocalVolmLib', useLocalVolmLib) inputs.property('useLocalVolmLib', useLocalVolmLib)
inputs.property('volmLibCoordinate', volmLibCoordinate) inputs.property('volmLibCoordinate', volmLibCoordinate)
inputs.property('localVolmLibCheckout', localVolmLibCheckout == null ? '' : localVolmLibCheckout.absolutePath)
outputs.dir(layout.projectDirectory.dir('adapters/fabric/build/test-results/test')) outputs.dir(layout.projectDirectory.dir('adapters/fabric/build/test-results/test'))
mustRunAfter(tasks.named('jar')) mustRunAfter(tasks.named('jar'))
mustRunAfter(project(':core').tasks.named('check')) mustRunAfter(project(':core').tasks.named('check'))
@@ -555,6 +555,19 @@ tasks.named('fabricJar').configure {
mustRunAfter(tasks.named('moddedTest')) mustRunAfter(tasks.named('moddedTest'))
} }
gradle.projectsEvaluated {
List<Task> sharedOutputTasks = allprojects.collectMany { Project candidate ->
candidate.tasks.findAll { Task task ->
task instanceof JavaCompile || task instanceof Jar || task instanceof Test
}
}
for (String taskName : ['moddedTest', 'fabricJar', 'forgeJar', 'neoforgeJar']) {
tasks.named(taskName).configure {
mustRunAfter(sharedOutputTasks)
}
}
}
tasks.named('check').configure { tasks.named('check').configure {
dependsOn('moddedTest') dependsOn('moddedTest')
} }