Merge pull request #57 from csmith/master

Build file improvements.

build.gradle

@@ -1,8 +1,7 @@
 subprojects {
-    apply plugin: GitVersion
-
     group = 'com.dmdirc.parser'
 
+    apply plugin: 'com.dmdirc.git-version'
     apply plugin: 'maven-publish'
     apply plugin: 'java'
 
@@ -89,22 +88,7 @@ subprojects {
         testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.17'
     }
 
-    task getCredentials << {
-        def target = file('../nexus-teamcity.gradle')
-        if (!target.exists()) {
-            new URL('http://www.dmdirc.com/private/nexus-teamcity.gradle').withInputStream{
-                 i -> target.withOutputStream { it << i }
-            }
-        }
-
-        apply from: '../nexus-teamcity.gradle'
-        project.publishing.repositories[0].credentials {
-            username "$nexusUser"
-            password "$nexusPass"
-        }
-    }
-
-    task publishSnapshot(dependsOn: ['getCredentials', 'publishMavenJavaPublicationToSnapshotsRepository']) << {
+    task publishSnapshot(dependsOn: 'publishMavenJavaPublicationToSnapshotsRepository') << {
     }
 
     task javadocJar(type: Jar) {
@@ -141,53 +125,10 @@ def find(name) {
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-            url 'http://artifactory.dmdirc.com/artifactory/repo'
-        }
+        maven { url 'https://dl.bintray.com/dmdirc/releases/' }
     }
 
     dependencies {
-        classpath group: 'com.github.shanemcc', name: 'jgit-describe', version: '0.5'
-        classpath group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '2.3.1.+'
+        classpath group: 'com.dmdirc', name: 'git-version', version: '1.0'
     }
 }
-
-class GitVersion implements Plugin<Project> {
-    void apply(Project project) {
-        def jgit = new org.mdonoughe.JGitDescribeTask()
-        jgit.dir = getGitDirectory(project)
-
-        def subdir = getRelativeSubdir(project, jgit.dir)
-        if (!subdir.isEmpty()) {
-            jgit.subdir = subdir
-        }
-
-        def version = jgit.description
-        project.version = getProjectVersion(version)
-    }
-
-    File getGitDirectory(Project project) {
-        def target = project.projectDir
-        def gitDir = new File(target, '.git')
-        while (!gitDir.exists() && target.parentFile != null) {
-            target = target.parentFile
-            gitDir = new File(target, '.git')
-        }
-        return gitDir
-    }
-
-    String getRelativeSubdir(Project project, File gitDir) {
-        def parent = gitDir.parentFile.absolutePath
-        def target = project.projectDir.absolutePath
-        return target.substring(parent.length())
-    }
-
-    String getProjectVersion(String gitVersion) {
-        if (gitVersion.matches('.*-[0-9]+-[0-9a-f]+$')) {
-            return gitVersion + '-SNAPSHOT'
-        } else {
-            return gitVersion
-        }
-    }
-
-}