Skip to content

Commit

Permalink
Remove separateMappingsForBuild.v1Output
Browse files Browse the repository at this point in the history
This is done as no other gradle task uses `.v1Output`, all tasks use
`.v2Output`. We change the task to output just one file, that being the
Tiny v2 file.
  • Loading branch information
zeichenreihe committed Oct 22, 2023
1 parent 7f92021 commit a1a745b
Showing 1 changed file with 8 additions and 15 deletions.
23 changes: 8 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -849,38 +849,31 @@ task feather(dependsOn: [nestJar, separateMappings]) {
}
}

task separateMappingsForBuild(type: WithV2FileOutput) {
task separateMappingsForBuild(type: FileOutput) {
inputs.dir mappingsDir

v1Output = new File(tempDir, "separated-mappings.tiny")
v2Output = new File(tempDir, "separated-mappings-v2.tiny")

output = new File(tempDir, "separated-mappings-v2.tiny")
outputs.file(output)
outputs.upToDateWhen { false }

doLast {
VersionGraph graph = VersionGraph.of(Format.TINY_V2, mappingsDir.toPath())
Mappings mappings = MappingUtils.separateMappings(graph, version_id);

mappings.setValidator(REMOVE_DUMMY)
Format.TINY_V2.writeMappings(v2Output.toPath(), mappings)

new ConvertMappingsCommand().run(
"tinyv2",
v2Output.getAbsolutePath(),
"tiny:${namespace}:named",
v1Output.getAbsolutePath())
Format.TINY_V2.writeMappings(output.toPath(), mappings)
}
}

task checkMappings(dependsOn: [mapCalamusJar, separateMappingsForBuild]) {
group = buildMappingGroup
inputs.file separateMappingsForBuild.v2Output
inputs.file separateMappingsForBuild.output
doLast {
logger.lifecycle(":checking mappings")

String[] args = [
mainJar.getAbsolutePath(),
separateMappingsForBuild.v2Output.getAbsolutePath()
separateMappingsForBuild.output.getAbsolutePath()
]

try {
Expand All @@ -893,7 +886,7 @@ task checkMappings(dependsOn: [mapCalamusJar, separateMappingsForBuild]) {

task buildFeatherTiny(dependsOn: [mapCalamusJar, separateMappingsForBuild], type: WithV2FileOutput) {
group = buildMappingGroup
inputs.file separateMappingsForBuild.v2Output
inputs.file separateMappingsForBuild.output
if (!libs.exists()) {
libs.mkdirs()
}
Expand All @@ -909,7 +902,7 @@ task buildFeatherTiny(dependsOn: [mapCalamusJar, separateMappingsForBuild], type
new MapSpecializedMethodsCommand().run(
calamusJar.getAbsolutePath(),
"tinyv2",
separateMappingsForBuild.v2Output.getAbsolutePath(),
separateMappingsForBuild.output.getAbsolutePath(),
"tinyv2:${namespace}:named",
v2Output.getAbsolutePath()
)
Expand Down

0 comments on commit a1a745b

Please sign in to comment.