Bladeren bron

Merge pull request #18 from csmith/master

Version util jar properly.
pull/19/head
Greg Holmes 9 jaren geleden
bovenliggende
commit
9a1b538ad8
1 gewijzigde bestanden met toevoegingen van 5 en 16 verwijderingen
  1. 5
    16
      build.gradle

+ 5
- 16
build.gradle Bestand weergeven

@@ -1,5 +1,9 @@
1 1
 import org.mdonoughe.JGitDescribeTask
2 2
 
3
+def jgit = new org.mdonoughe.JGitDescribeTask()
4
+jgit.setDir(new File("$projectDir", '.git'))
5
+project.version = jgit.getDescription() + '-SNAPSHOT'
6
+
3 7
 apply plugin: 'java'
4 8
 apply plugin: 'maven-publish'
5 9
 
@@ -62,22 +66,7 @@ task getCredentials << {
62 66
     }
63 67
 }
64 68
 
65
-task getVersion << {
66
-    def jgit = new org.mdonoughe.JGitDescribeTask()
67
-    jgit.setDir(new File("$rootDir", '.git'))
68
-
69
-    project.version = jgit.getDescription() + '-SNAPSHOT'
70
-
71
-    project.tasks.withType(PublishToMavenRepository) {
72
-        publishTask -> publishTask.publication.version = project.version
73
-    }
74
-
75
-    project.tasks.withType(GenerateMavenPom).each {
76
-        generateMavenPomTask -> generateMavenPomTask.pom.getProjectIdentity().version = project.version
77
-    }
78
-}
79
-
80
-task publishSnapshot(dependsOn: ['getCredentials', 'getVersion', 'publishMavenJavaPublicationToSnapshotsRepository']) << {
69
+task publishSnapshot(dependsOn: ['getCredentials', 'publishMavenJavaPublicationToSnapshotsRepository']) << {
81 70
 }
82 71
 
83 72
 buildscript {

Laden…
Annuleren
Opslaan