infiniteserver/fabric
1
0
Fork 0
forked from FabricMC/fabric
Code Pull requests Activity

Append a substring of the mc version to the hash of the submodule to prevent issues where the source is the same but produces different bytecode that is not compatible across mc versions

Browse source
This commit is contained in:
modmuss50 2019-07-14 17:42:09 +01:00
parent b8deb199a0
commit 4229e3b785
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
build.gradle
View file

@ -11,9 +11,13 @@ plugins {
def ENV = System.getenv()
def baseVersion = "0.3.0"
def mcVersion = "1.14.3"
def yarnVersion = "+build.1"
class Globals {
static def baseVersion = "0.3.0"
static def mcVersion = "1.14.3"
static def yarnVersion = "+build.1"
}
import org.apache.commons.codec.digest.DigestUtils
def getSubprojectVersion(project, version) {
if (grgit == null) {
@ -23,7 +27,7 @@ def getSubprojectVersion(project, version) {
if (latestCommits.isEmpty()) {
return version + "+uncommited"
} else {
return version + "+" + latestCommits.get(0).id.substring(0, 8)
return version + "+" + latestCommits.get(0).id.substring(0, 8) + DigestUtils.sha256Hex(Globals.mcVersion).substring(0, 2)
}
}
@ -38,8 +42,8 @@ allprojects {
group = "net.fabricmc.fabric-api"
dependencies {
minecraft "com.mojang:minecraft:$mcVersion"
mappings "net.fabricmc:yarn:${mcVersion}${yarnVersion}"
minecraft "com.mojang:minecraft:$Globals.mcVersion"
mappings "net.fabricmc:yarn:${Globals.mcVersion}${Globals.yarnVersion}"
modCompile "net.fabricmc:fabric-loader:0.4.8+build.154"
}
@ -173,7 +177,7 @@ dependencies {
}
}
version = baseVersion + "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local")
version = Globals.baseVersion + "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local")
curseforge {
if (project.hasProperty('curse_api_key')){
@ -185,7 +189,7 @@ curseforge {
releaseType = 'alpha'
addGameVersion '1.14-Snapshot'
mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) {
displayName = "[$mcVersion] Fabric API $baseVersion build $ENV.BUILD_NUMBER"
displayName = "[$Globals.mcVersion] Fabric API $Globals.baseVersion build $ENV.BUILD_NUMBER"
}
afterEvaluate {
uploadTask.dependsOn("remapJar")