Attempted to update to ForgeGradle 2
This commit is contained in:
parent
f4d8331206
commit
cc56619bf0
91
build.gradle
91
build.gradle
|
@ -11,12 +11,12 @@ buildscript {
|
|||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
|
||||
classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: "forge"
|
||||
apply plugin: "curseforge"
|
||||
apply plugin: 'net.minecraftforge.gradle.forge'
|
||||
apply plugin: "maven"
|
||||
|
||||
repositories {
|
||||
flatDir {
|
||||
|
@ -47,10 +47,6 @@ minecraft {
|
|||
// add some stuff to the version
|
||||
version = "${config.minecraft_version}-${config.mod_version}.${System.getenv().BUILD_NUMBER}"
|
||||
|
||||
jenkins {
|
||||
job = 'BiomesOPlenty'
|
||||
}
|
||||
|
||||
// Source compiler configuration
|
||||
tasks.withType(JavaCompile) {
|
||||
//options.compilerArgs += [ '-Xlint:all', '-Xlint:-path', '-Xlint:-processing' ]
|
||||
|
@ -90,47 +86,23 @@ processResources {
|
|||
}
|
||||
}
|
||||
|
||||
import net.minecraftforge.gradle.tasks.dev.ChangelogTask
|
||||
import net.minecraftforge.gradle.tasks.JenkinsChangelog
|
||||
import net.minecraftforge.gradle.common.Constants
|
||||
import net.minecraftforge.gradle.delayed.*
|
||||
|
||||
task createChangelog(type: ChangelogTask) {
|
||||
def jobName = "${System.getenv().JOB_NAME}"
|
||||
task createChangelog(type: JenkinsChangelog) {
|
||||
def buildNumber = "${System.getenv().BUILD_NUMBER}"
|
||||
|
||||
setServerRoot(new DelayedString(project, 'http://ci.jenkins.minecraftforge.net/'))
|
||||
setJobName(new DelayedString(project, jobName.toString()));
|
||||
setAuthName(new DelayedString(project, 'console_script'));
|
||||
setAuthPassword(new DelayedString(project, 'dc6d48ca20a474beeac280a9a16a926e'));
|
||||
setTargetBuild({buildNumber.toString()});
|
||||
setOutput(new DelayedFile(project, 'build/libs/' + project.getName() + '-' + project.version + '-changelog.txt'));
|
||||
}
|
||||
|
||||
def curseChangelog
|
||||
|
||||
task createCurseChangelog {
|
||||
def env = System.getenv()
|
||||
def jenkinsUrl = env.JENKINS_URL
|
||||
def jenkinsJob = env.JOB_NAME
|
||||
def buildNumber = env.BUILD_NUMBER
|
||||
|
||||
if (jenkinsUrl != null && jenkinsJob != null && buildNumber != null) {
|
||||
def auth = "console_script:dc6d48ca20a474beeac280a9a16a926e".getBytes().encodeBase64().toString()
|
||||
def url = new URL("$jenkinsUrl/job/$jenkinsJob/$buildNumber/api/xml?depth=20").openConnection()
|
||||
url.setRequestProperty("Authorization", "Basic " + auth)
|
||||
String data = url.getInputStream().text
|
||||
|
||||
def xml = new XmlSlurper().parseText(data)
|
||||
|
||||
xml.changeSet.item.each { change ->
|
||||
curseChangelog += "$change.author.fullName: $change.msg" + '\n'
|
||||
}
|
||||
}
|
||||
serverRoot = 'http://ci.jenkins.minecraftforge.net/'
|
||||
jobName = 'BiomesOPlenty'
|
||||
authName = 'console_script';
|
||||
authPassword = 'dc6d48ca20a474beeac280a9a16a926e';
|
||||
targetBuild = buildNumber.toString();
|
||||
output = 'build/libs/' + project.getName() + '-' + project.version + '-changelog.txt';
|
||||
}
|
||||
|
||||
tasks.build.dependsOn('createChangelog')
|
||||
|
||||
task sourceJar(type: Jar) {
|
||||
task sourcesJar(type: Jar) {
|
||||
from sourceSets.main.allJava
|
||||
from (sourceSets.main.output) {
|
||||
include 'LICENSE.txt'
|
||||
|
@ -147,34 +119,26 @@ task deobfJar(type: Jar) {
|
|||
}
|
||||
|
||||
artifacts {
|
||||
archives sourceJar
|
||||
archives sourcesJar
|
||||
archives deobfJar
|
||||
}
|
||||
|
||||
curse {
|
||||
dependsOn "createCurseChangelog"
|
||||
|
||||
projectId = project.config.curse_project_id
|
||||
apiKey = "$System.env.curse_api_key"
|
||||
changelog = curseChangelog
|
||||
releaseType = project.config.curse_release_type
|
||||
|
||||
additionalArtifact deobfJar
|
||||
additionalArtifact sourceJar
|
||||
}
|
||||
|
||||
uploadArchives {
|
||||
dependsOn 'reobf'
|
||||
repositories.mavenDeployer {
|
||||
dependsOn 'build'
|
||||
|
||||
repositories {
|
||||
if ("$System.env.maven_username" != "null" && "$System.env.maven_password" != "null") {
|
||||
logger.info('Publishing to files server')
|
||||
|
||||
mavenDeployer {
|
||||
configuration = configurations.deployJars
|
||||
|
||||
repository(url: project.filesmaven.url) {
|
||||
authentication(userName: "$System.env.maven_username", privateKey: "$System.env.maven_password")
|
||||
repository(url: "http://files.minecraftforge.net/maven/manage/upload") {
|
||||
authentication(userName: "$System.env.maven_username", password: "$System.env.maven_password")
|
||||
}
|
||||
} else {
|
||||
logger.info('Publishing to repo folder')
|
||||
|
||||
pom.version = "${project.minecraft.version}-${project.version}"
|
||||
repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
|
||||
}
|
||||
|
||||
pom {
|
||||
|
@ -231,13 +195,4 @@ uploadArchives {
|
|||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
logger.info('Publishing to repo folder')
|
||||
|
||||
mavenDeployer {
|
||||
pom.version = "${project.minecraft.version}-${project.version}"
|
||||
repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
minecraft_version=1.8
|
||||
forge_version=11.14.3.1502
|
||||
forge_version=11.14.3.1514
|
||||
mod_version=3.0.0
|
||||
curse_project_id=220318
|
||||
curse_release_type=alpha
|
||||
|
|
Binary file not shown.
|
@ -1,6 +1,6 @@
|
|||
#Wed Jul 02 15:54:47 CDT 2014
|
||||
#Mon Sep 14 12:28:28 PDT 2015
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
|
||||
|
|
Loading…
Reference in New Issue