From cd3986bb42ce7cca3cf561b78c3dd3c8b7588370 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Tue, 23 Apr 2024 11:13:01 -0400
Subject: [PATCH] change build logic

---
 build.gradle | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 203b940..79874ae 100755
--- a/build.gradle
+++ b/build.gradle
@@ -56,12 +56,12 @@ task unpack(type: Copy) {
     into("build/dependency")
 }
 
-def getTagInfo() {
-    if (project.hasProperty('tag')) {
-        def tagValue = project.property('tag')
-        return tagValue
-    } else {
-        def gitBranch = "Unknown branch"
+def getCurrentGitBranch() {
+  if (project.hasProperty('tag')) {
+    def tagValue = project.property('tag')
+    return tagValue
+  } else {
+      def gitBranch = "Unknown branch"
       try {
         def workingDir = new File("${project.projectDir}")
         def result = 'git rev-parse --abbrev-ref HEAD'.execute(null, workingDir)
@@ -71,17 +71,16 @@ def getTagInfo() {
         }
       } catch (e) {
         }
-        if (gitBranch  == "develop" || gitBranch == "master"){
-          return "${jar.version}"
+        if (gitBranch == "develop" || gitBranch == "master"){
+          return project.version
         }else{
           return gitBranch
         }
-        return gitBranch
     }
 }
 
 docker {
-    name "kingstonduo/cassiopeia-data:" + getTagInfo()
+    name "${project.group}/cassiopeia-data:" + getCurrentGitBranch()
     copySpec.from(tasks.unpack.outputs).into("dependency")
     buildArgs(['DEPENDENCY': "dependency"])
 }