mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-13 16:54:13 +00:00
Merge branch '1.7/release' into 1.7/release
This commit is contained in:
1 file changed
+1
-15
+1
-15
@@ -12,7 +12,6 @@ buildscript {
|
||||
}
|
||||
dependencies {
|
||||
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
|
||||
classpath 'org.ajoberstar:gradle-git:0.10.1'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,22 +25,9 @@ apply plugin: 'maven-publish'
|
||||
sourceCompatibility = 1.8
|
||||
targetCompatibility = 1.8
|
||||
|
||||
import org.ajoberstar.grgit.Grgit
|
||||
|
||||
def repo = Grgit.open(project.file('.'))
|
||||
project.ext.gitHash = repo.log().find().abbreviatedId
|
||||
def branchname = repo.branch.getCurrent().fullName
|
||||
if (branchname.contains('HEAD')) {
|
||||
branchname = System.getenv("GIT_BRANCH")
|
||||
}
|
||||
branchname = branchname.substring(branchname.lastIndexOf('/') + 1)
|
||||
|
||||
boolean dev = System.getenv("RELEASE") == null || System.getenv("RELEASE").equalsIgnoreCase("false")
|
||||
|
||||
ext.buildnumber = 0
|
||||
project.buildnumber = System.getenv('BUILD_NUMBER') == null ? "CUSTOM" : System.getenv('BUILD_NUMBER')
|
||||
|
||||
version = dev ? "${branchname}-${buildnumber}-${project.ext.gitHash}" : "${mod_version}.${buildnumber}"
|
||||
version = "${mod_version}"
|
||||
group = "team.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||
archivesBaseName = "Chisel"
|
||||
|
||||
|
||||
Reference in new issue
Block a user