Merge pull request #97 from davidmoten/fix-versions

deepak2016 · web-flow · commit f21970414d8e · 2018-08-02T11:58:46.000+05:30
fix published artifact versions
diff --git a/build.gradle b/build.gradle
@@ -55,7 +55,7 @@ publishing {
 
             artifactId 'microsoft-graph'
 
-            version '${mavenMajorVersion}.${mavenMinorVersion}-SNAPSHOT'
+            version "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"
 
             from components.java
 
@@ -88,7 +88,7 @@ def getVersionCode() {
 }
 
 def getVersionName() {
-    return "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
+    return "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"
 }
 
 uploadArchives {
diff --git a/gradle.properties b/gradle.properties
@@ -25,8 +25,9 @@ mavenRepoUrl         = https://api.bintray.com/maven/microsoftgraph/Maven/micros
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph
 mavenMajorVersion    = 0
-mavenMinorVersion    = 2
+mavenMinorVersion    = 4
 mavenPatchVersion    = 0
+mavenArtifactSuffix = -SNAPSHOT
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 
 #These values are used to run functional tests

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ publishing {`
`55`	`55`
`56`	`56`	`artifactId 'microsoft-graph'`
`57`	`57`
`58`		`- version '${mavenMajorVersion}.${mavenMinorVersion}-SNAPSHOT'`
	`58`	`+ version "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"`
`59`	`59`
`60`	`60`	`from components.java`
`61`	`61`
`@@ -88,7 +88,7 @@ def getVersionCode() {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`def getVersionName() {`
`91`		`- return "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"`
	`91`	`+ return "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`uploadArchives {`