From 162c88d191bf4560038561b1ac4648ff234470d9 Mon Sep 17 00:00:00 2001
From: Roan Hofland <roan@roanh.dev>
Date: Fri, 18 Mar 2022 00:29:53 +0100
Subject: [PATCH] Fix all versioning issues

---
 .gitlab-ci.yml     | 1 -
 gMark/build.gradle | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7334ec9a..702328fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ image: openjdk:8
 variables:
   NAME: "${CI_PROJECT_NAME}-${CI_PIPELINE_ID}-${CI_BUILD_REF_NAME}"
   PROJECTNAME: gMark
-  VERSION: ${CI_COMMIT_REF_NAME}
 
 before_script:
   - java -version
diff --git a/gMark/build.gradle b/gMark/build.gradle
index be8fb8e1..13dcf153 100644
--- a/gMark/build.gradle
+++ b/gMark/build.gradle
@@ -13,7 +13,7 @@ plugins{
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 group = 'dev.roanh.gmark'
-version = System.getenv("VERSION") ? System.getenv("VERSION").substring(1) : 'SNAPSHOT'
+version = '1.0'//Main.java
 
 sourceSets{
 	main{
@@ -61,9 +61,9 @@ task clientJar(type: ShadowJar, group: "build"){
 }
 
 task cliJar(type: ShadowJar, group: "build"){
-	appendix = "cli"
 	from sourceSets.main.output
 	configurations = [project.configurations.implementation]
+	archiveName = 'gMark-cli.jar'
 	manifest{
 		attributes 'Main-Class': 'dev.roanh.gmark.Main'
 	}
@@ -82,7 +82,6 @@ eclipse.classpath.downloadJavadoc = true
 compileJava.options.encoding = 'UTF-8'
 compileClientJava.options.encoding = 'UTF-8'
 sourceCompatibility = 1.8
-version = 'v1.0'//Main.java
 shadowJar.archiveName = 'gMark-v' + project.version + '.jar'
 
 repositories{