chore: fix gradle files

rudderlabs · Aug 1, 2023 · e9f9023 · e9f9023
1 parent 3d74168
commit e9f9023
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -37,5 +37,5 @@ apply from: rootProject.file('gradle/promote.gradle')
 apply from: rootProject.file('gradle/codecov.gradle')
 subprojects {
     group GROUP
-    version getVersionName()
+    version getVersionName(VERSION_NAME)
 }
diff --git a/gradle/mvn-publish.gradle b/gradle/mvn-publish.gradle
@@ -8,7 +8,7 @@ publishing {
             // we'll set up in a moment
             groupId GROUP
             artifactId POM_ARTIFACT_ID
-            version getVersionName()
+            version getVersionName(VERSION_NAME)
             if (POM_PACKAGING == "aar") {
                 artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
             } else {

diff --git a/gradle/promote.gradle b/gradle/promote.gradle
@@ -1,7 +1,7 @@
 apply from: rootProject.file('gradle/versioning.gradle')
 
 group GROUP
-version getVersionName()
+version getVersionName(VERSION_NAME)
 //project.logger.info("Signing id: ${hasProperty("signing.keyId")}")
 // Create variables with empty default values
 ext["signing.keyId"] = ''

diff --git a/gradle/versioning.gradle b/gradle/versioning.gradle
@@ -3,7 +3,11 @@ def isReleaseBuild() {
 }
 
 def getVersionName() { // If not release build add SNAPSHOT suffix
-    return isReleaseBuild() ? VERSION_NAME : VERSION_NAME+"-SNAPSHOT"
+    return getVersionName(VERSION_NAME)
+}
+def getVersionName(version) { // If not release build add SNAPSHOT suffix
+    println("versioning call:$version")
+    return isReleaseBuild() ? version : version+"-SNAPSHOT"
 }
 
 ext {