1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-13 03:30:29 +00:00

Fix building from a fresh setup

We were attempting to resolve the Forge jars before they had been
generated, which meant the build failed.
This commit is contained in:
SquidDev 2019-02-16 15:57:35 +00:00
parent 63f6735bb8
commit 18d468e887

View File

@ -106,10 +106,19 @@ import proguard.gradle.ProGuardTask
task proguard(type: ProGuardTask, dependsOn: jar) {
description "Removes unused shadowed classes from the jar"
group "compact"
injars jar.archivePath
outjars "${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar"
// Add the main runtime jar and all non-shadowed dependencies
libraryjars "${System.getProperty('java.home')}/lib/rt.jar"
doFirst {
sourceSets.main.compileClasspath
.filter { !it.name.contains("Cobalt") }
.each { libraryjars it }
}
// We want to avoid as much obfuscation as possible. We're only doing this to shrink code size.
dontobfuscate; dontoptimize; keepattributes; keepparameternames
@ -123,18 +132,6 @@ task proguard(type: ProGuardTask, dependsOn: jar) {
keepclassmembers 'class org.squiddev.cobalt.lib.** { <init>(...); }'
}
gradle.projectsEvaluated {
tasks.withType(ProGuardTask) {
group "compact"
// Add the main runtime jar and all non-shadowed dependencies
libraryjars "${System.getProperty('java.home')}/lib/rt.jar"
sourceSets.main.compileClasspath
.filter { !it.name.contains("Cobalt") }
.each { libraryjars it }
}
}
task proguardMove(dependsOn: proguard) {
description "Replace the original jar with the minified version"
group "compact"