From eb9acd538c9b5fed13d4e67c47f895c7a0eafc3a Mon Sep 17 00:00:00 2001 From: chylex <info@chylex.com> Date: Tue, 13 Oct 2015 01:58:31 +0200 Subject: [PATCH] Format and tweak build.gradle --- build.gradle | 34 ++++++++++++++++------------------ gradle.properties | 5 ----- 2 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 gradle.properties diff --git a/build.gradle b/build.gradle index 21b90a6..63d2ccd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ buildscript{ repositories{ mavenCentral() + maven{ name = "forge" url = "http://files.minecraftforge.net/maven" @@ -10,27 +11,23 @@ buildscript{ url = "https://oss.sonatype.org/content/repositories/snapshots/" } } + dependencies{ classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' } } -plugins { - id 'com.matthewprenger.cursegradle' version '1.0.2' -} - apply plugin: 'forge' apply plugin: 'maven-publish' -apply plugin: 'curseforge' group = "chylex.javacheck" - ext.buildnumber = 0 project.buildnumber = System.getenv('BUILD_NUMBER') == null ? "CUSTOM" : System.getenv('BUILD_NUMBER') -version = "UNIVERSAL-${mod_version}.${buildnumber}" + +String archiveSuffix = " MC-UNIVERSAL v1.2.jar" minecraft{ - version = "${mc_version}-${forge_version}-${mc_version}" + version = "1.7.10-10.13.4.1492-1.7.10" runDir = "eclipse" } @@ -41,7 +38,7 @@ task java7Jar(type: Jar, dependsOn: "jar"){ attributes 'TweakClass': 'chylex.javacheck.Java7Checker' } - archivesBaseName = "Java7Checker" + archiveName = "Java7Checker"+archiveSuffix } task java8Jar(type: Jar, dependsOn: "jar"){ @@ -51,13 +48,13 @@ task java8Jar(type: Jar, dependsOn: "jar"){ attributes 'TweakClass': 'chylex.javacheck.Java8Checker' } - archivesBaseName = "Java8Checker" + archiveName = "Java8Checker"+archiveSuffix } task shadeJar(type: Jar, dependsOn: "jar"){ from sourceSets.main.output - archivesBaseName = "JavaCheckerShade" + archiveName = "JavaCheckerShade"+archiveSuffix } jar.enabled = false @@ -84,17 +81,18 @@ processResources{ } } -publishing { +publishing{ tasks.publish.dependsOn 'build' - publications { - mavenJava(MavenPublication) { + + publications{ + mavenJava(MavenPublication){ artifact shadeJar } } - - repositories { - if (project.hasProperty('mavendir')) { + + repositories{ + if (project.hasProperty("mavendir")){ maven { url mavendir } } } -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 2f3365a..0000000 --- a/gradle.properties +++ /dev/null @@ -1,5 +0,0 @@ -mod_version=1.2.0 -projectId=0 - -mc_version=1.7.10 -forge_version=10.13.4.1492 \ No newline at end of file