Skip to content

Commit 3cde428

Browse files
committed
build: Replace outputs with archiveFile
Because `Task`, which is referenced from `TaskOutputs`, isn't serializable as far as the Configuration Cache is concerned.
1 parent 9e26cfe commit 3cde428

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

integrationTest/launchwrapper/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ tasks.register("essentialWithDummyStage1", Jar) {
329329
from(sourceSets.essential.output)
330330
includeMixin(it, configurations.mixin07)
331331

332-
from(tasks.named("dummyStage1Jar").map { it.outputs }) {
332+
from(tasks.named("dummyStage1Jar").map { it.archiveFile }) {
333333
rename { "gg/essential/loader/stage0/stage1.jar" }
334334
}
335335
}

stage0/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ configure(subprojects.findAll { it.name != "common" && it.name != "modlauncher"
2929
dependsOn configurations.bundle
3030
from { configurations.bundle.collect { archiveOps.zipTree(it) } }
3131

32-
from(evaluationDependsOn(":stage1:$variant").tasks.named("jar").map { it.outputs }) {
32+
from(evaluationDependsOn(":stage1:$variant").tasks.named("jar").map { it.archiveFile }) {
3333
rename { "gg/essential/loader/stage0/stage1.jar" }
3434
}
3535
}

stage1/launchwrapper/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
}
1313

1414
jar {
15-
from(evaluationDependsOn(":stage2:launchwrapper").tasks.named("jar").map { it.outputs }) {
15+
from(evaluationDependsOn(":stage2:launchwrapper").tasks.named("jar").map { it.archiveFile }) {
1616
rename { "gg/essential/loader/stage1/stage2.jar" }
1717
}
1818
}

stage2/launchwrapper-legacy/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dependencies {
33
}
44

55
jar {
6-
from(evaluationDependsOn(":stage2:launchwrapper").tasks.named("jar").map { it.outputs }) {
6+
from(evaluationDependsOn(":stage2:launchwrapper").tasks.named("jar").map { it.archiveFile }) {
77
rename { "gg/essential/loader/stage2/real-stage2.jar" }
88
}
99
}

0 commit comments

Comments
 (0)