cleaned up gradle scripts a little more (pulled version out of base name)

This commit is contained in:
Florian Nücke 2014-03-09 11:49:48 +01:00
parent dfa24ac35c
commit ed43b7fe31
4 changed files with 7 additions and 4 deletions

View File

@ -22,11 +22,14 @@ file "build.properties" withReader {
version = "${config.oc.version}" version = "${config.oc.version}"
group = "li.cil.oc" group = "li.cil.oc"
archivesBaseName = "OpenComputers-MC${config.minecraft.version}" archivesBaseName = "OpenComputers"
if (System.getenv("BUILD_NUMBER") != null) if (System.getenv("BUILD_NUMBER") != null)
version += ".${System.getenv("BUILD_NUMBER")}" version += ".${System.getenv("BUILD_NUMBER")}"
ext.simpleVersion = version
version = "MC${config.minecraft.version}-${project.version}"
apply from: 'gradle/forge.gradle' apply from: 'gradle/forge.gradle'
apply from: 'gradle/artifact.gradle' apply from: 'gradle/artifact.gradle'
apply from: 'gradle/release.gradle' apply from: 'gradle/release.gradle'

View File

@ -1,7 +1,8 @@
jar { jar {
classifier = 'universal' classifier = 'universal'
manifest { manifest {
attributes FMLCorePlugin: "li.cil.oc.common.launch.TransformerLoader", FMLCorePluginContainsFMLMod: "true" attributes FMLCorePlugin: "li.cil.oc.common.launch.TransformerLoader"
attributes FMLCorePluginContainsFMLMod: "true"
} }
} }

View File

@ -18,7 +18,7 @@ minecraft {
processResources { processResources {
from(sourceSets.main.resources.srcDirs) { from(sourceSets.main.resources.srcDirs) {
include 'mcmod/info' include 'mcmod/info'
expand 'version':project.version, 'mcversion':config.minecraft.version expand 'version': project.simpleVersion, 'mcversion': config.minecraft.version
} }
from(sourceSets.main.resources.srcDirs) { from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info' exclude 'mcmod.info'

View File

@ -3,7 +3,6 @@ apply plugin: 'maven-publish'
publishing { publishing {
publications { publications {
mavenJava(MavenPublication) { mavenJava(MavenPublication) {
version "MC${minecraft.version}-${project.version}"
artifact apiJar artifact apiJar
artifact deobfJar artifact deobfJar
} }