Skip to content

Commit

Permalink
Update Stitch to match new semantics (FabricMC#767)
Browse files Browse the repository at this point in the history
Signed-off-by: liach <[email protected]>
  • Loading branch information
liach authored and asiekierka committed Jun 29, 2019
1 parent 30dc644 commit bac8d3f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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"
}

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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")

Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit bac8d3f

Please sign in to comment.