Fixed the release tag generation

dilipkrish · dilipkrish · commit 10b839f790a7 · 2016-03-02T19:25:01.000-06:00
Also changed the order in which the new versions are persisted in the database
diff --git a/buildSrc/src/main/groovy/springfox/gradlebuild/BuildInfo.groovy b/buildSrc/src/main/groovy/springfox/gradlebuild/BuildInfo.groovy
@@ -50,7 +50,10 @@ class BuildInfo {
   }
 
   String getReleaseTag() {
-    currentVersion.next(releaseType, "")
+    if (isReleaseBuild) {
+      return "${buildVersion.major}.${buildVersion.minor}.${buildVersion.patch}"
+    }
+    ""
   }
 
   boolean getIsReleaseBuild() {
diff --git a/buildSrc/src/main/groovy/springfox/gradlebuild/version/FileVersionStrategy.groovy b/buildSrc/src/main/groovy/springfox/gradlebuild/version/FileVersionStrategy.groovy
@@ -41,9 +41,9 @@ class FileVersionStrategy implements VersioningStrategy, GitTaggingSupport, GitV
   @Override
   void persist(Project project, BuildInfo buildInfo) {
     if (buildInfo.isReleaseBuild) {
+      createAnnotatedTag(project, buildInfo)
       updateVersionFile(project, buildInfo)
       commitToRepository(project, buildInfo)
-      createAnnotatedTag(project, buildInfo)
     } else {
       project.logger.warn("Should never be called when its a snapshot build")
     }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,10 @@ class BuildInfo {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`String getReleaseTag() {`
`53`		`- currentVersion.next(releaseType, "")`
	`53`	`+ if (isReleaseBuild) {`
	`54`	`+ return "${buildVersion.major}.${buildVersion.minor}.${buildVersion.patch}"`
	`55`	`+ }`
	`56`	`+ ""`
`54`	`57`	`}`
`55`	`58`
`56`	`59`	`boolean getIsReleaseBuild() {`