Merge pull request #517 from kaendfinger/master

Reformated build.gradle
This commit is contained in:
pahimar 2013-12-19 05:55:25 -08:00
commit cc74d32ffb
3 changed files with 66 additions and 70 deletions

1
.gitignore vendored
View file

@ -16,3 +16,4 @@
/out
/.idea
/*.iml
/atlassian-ide-plugin.xml

View file

@ -20,7 +20,7 @@ configFile.withReader {
// read config. it shall from now on be referenced as simply config or as project.config
def prop = new Properties()
prop.load(it)
project.ext.config = new ConfigSlurper().parse prop
ext.config = new ConfigSlurper().parse prop
}
group = "com.pahimar.ee3"
@ -36,8 +36,7 @@ minecraft {
replace "@FINGERPRINT@", project.ee3_signature
}
processResources
{
processResources {
// replace stuff in the files we want.
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
@ -52,28 +51,27 @@ processResources
exclude 'mcmod.info'
exclude 'version.properties'
}
}
}
// BEYOND THIS POINT..
// IS STUFF THATS FOR RELEASING...
// verify the properties exist.. or initialize.
if (!project.hasProperty("keystore_location")) // keystore stuff
ext.keystore_location = ".";
ext.keystore_location = "."
if (!project.hasProperty("ee3_keystore_alias")) // keystore stuff
ext.ee3_keystore_alias = "";
ext.ee3_keystore_alias = ""
if (!project.hasProperty("keystore_password")) // keystore stuff
ext.keystore_password = "";
ext.keystore_password = ""
if (!project.hasProperty("ee3_release_loc")) // release loc
ext.ee3_release_loc = ".";
ext.ee3_release_loc = "."
else
ee3_release_loc = ee3_release_loc.replace('{MC}', minecraft.version).replace('{MODVER}', config.mod_version).replace('{BUILD}', config.build_number)
task("signJar", dependsOn: "reobf")
{
task signJar(dependsOn: "reobf") {
inputs.file jar.getArchivePath()
inputs.file keystore_location
inputs.property "ee3_keystore_alias", ee3_keystore_alias
@ -95,12 +93,10 @@ task("signJar", dependsOn: "reobf")
storepass: keystore_password
)
}
}
}
task("incrementBuildNumber")
{
// increment build number
doFirst {
task incrementBuildNumber() {
doLast {
// increment
config.build_number = (config.build_number.toString().toInteger()) + 1
@ -109,10 +105,9 @@ task("incrementBuildNumber")
config.toProperties().store(it, "")
}
}
}
}
task("release", type: Copy)
{
task release(type: Copy) {
dependsOn "incrementBuildNumber"
dependsOn "signJar"
@ -120,8 +115,8 @@ task("release", type: Copy)
logger.info "copying ${file}"
}
// only if the release location isnt empty.
// only if the release location isn't empty.
onlyIf {
return project.ee3_release_loc != "."
}
}
}

View file

@ -1,6 +1,6 @@
#
#Sat Dec 14 19:57:18 EST 2013
#Tue Dec 17 19:56:56 EST 2013
minecraft_version=1.6.4
forge_version=9.11.1.964
mod_version=0.0
build_number=28
build_number=30