From 7fc3ac8e4e1586157a6ec5debc924c429d6c870c Mon Sep 17 00:00:00 2001 From: pahimar Date: Wed, 4 Jun 2014 20:21:56 -0400 Subject: [PATCH] Bumping Forge to 1110, and testing automatic changelog generation --- build.gradle | 51 ++++++++++++++++++++++++++++++++---------------- build.properties | 2 +- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index dba49e41..deadb4a6 100644 --- a/build.gradle +++ b/build.gradle @@ -34,27 +34,44 @@ minecraft { assetDir = "run/assets" replaceIn "reference/Reference.java" - replace "@VERSION@", config.mod_version + replace "@VERSION@", "${config.mod_version}.${System.getenv("BUILD_NUMBER") ?: 0}" } version = "${config.minecraft_version}-${config.mod_version}.${System.getenv("BUILD_NUMBER") ?: 0}" -processResources - { - // exclude xcf files, as they are for development only - exclude '**/*.xcf' +processResources { + // exclude xcf files, as they are for development only + exclude '**/*.xcf' - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include '*.info' + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include '*.info' - // replace version and mcversion - expand 'mod_version': project.version, 'minecraft_version': project.config.minecraft_version - } + // replace version and mcversion + expand 'mod_version': project.version, 'minecraft_version': project.config.minecraft_version + } - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - include '**/*.info' - include '**/*.properties' - } - } + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + include '**/*.info' + include '**/*.properties' + } +} + + +import net.minecraftforge.gradle.delayed.* +import net.minecraftforge.gradle.tasks.dev.ChangelogTask + +task createChangelog(type: ChangelogTask) { + def jobName = "${System.getenv().JOB_NAME}" + def buildNumber = "${System.getenv().BUILD_NUMBER}" + + setServerRoot(new DelayedString(project, project.jenkins_server)) + setJobName(new DelayedString(project, jobName.toString())) + setAuthName(new DelayedString(project, project.jenkins_user)) + setAuthPassword(new DelayedString(project, project.jenkins_password)) + setTargetBuild({ buildNumber.toString() }); + setOutput(new DelayedFile(project, 'build/distributions/' + project.getName() + '-' + project.version + '-changelog.txt')); +} + +tasks.build.dependsOn('createChangelog') \ No newline at end of file diff --git a/build.properties b/build.properties index c00d665b..3b638e6e 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # #Sat Dec 28 00:14:08 EST 2013 minecraft_version = 1.7.2 -forge_version = 10.12.1.1098 +forge_version = 10.12.1.1110 mod_version = 0.2