mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update Stitch to match new semantics (#767) 

Signed-off-by: liach <liach@users.noreply.github.com>
This commit is contained in:
liach 2019-06-29 19:08:36 +08:00 committed by Adrian Siekierka
parent 30dc644d22
commit bac8d3fecf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath "cuchaz:enigma:0.14.0.128"
classpath "net.fabricmc:stitch:0.2.1.60"
classpath "net.fabricmc:stitch:0.2.1.61"
classpath "commons-io:commons-io:2.6"
classpath "com.google.guava:guava:28.0-jre"
classpath 'de.undercouch:gradle-download-task:3.4.3'
@ -49,7 +49,7 @@ configurations {
}
dependencies {
enigmaRuntime "net.fabricmc:stitch:0.2.1.60"
enigmaRuntime "net.fabricmc:stitch:0.2.1.61"
enigmaRuntime "cuchaz:enigma:0.14.0.128:all"
}
@ -89,6 +89,7 @@ import net.fabricmc.tinyremapper.TinyRemapper
import net.fabricmc.tinyremapper.TinyUtils
import org.apache.commons.io.FileUtils
import java.nio.charset.StandardCharsets
import java.util.zip.GZIPOutputStream
boolean validateChecksum(File file, String checksum) {
@ -219,7 +220,7 @@ task downloadMcLibs(dependsOn: downloadWantedVersionManifest) {
throw new RuntimeException("Can't download the jars without the ${versionFile.name} file!")
}
def version = new JsonSlurper().parseText(FileUtils.readFileToString(versionFile))
def version = new JsonSlurper().parseText(FileUtils.readFileToString(versionFile, StandardCharsets.UTF_8))
logger.lifecycle(":downloading minecraft libraries")
@ -339,7 +340,7 @@ task checkMappings {
}
}
task buildYarnTiny(dependsOn: "mergeJars",type: FileOutput) {
task buildYarnTiny(dependsOn: "mergeJars", type: FileOutput) {
group = buildMappingGroup
inputs.dir mappingsDir
if (!libs.exists()) {
@ -515,8 +516,7 @@ task buildTinyWithEnum(dependsOn: "mergeTiny", type: FileOutput) {
String[] argsPropose = [
mergedFile.getAbsolutePath(), // must use official jar
noEnum.getAbsolutePath(),
namedWithEnum.getAbsolutePath(),
"--writeAll"
namedWithEnum.getAbsolutePath()
]
new CommandProposeFieldNames().run(argsPropose)