Fix all versioning issues

RoanH · Mar 17, 2022 · 162c88d · 162c88d
1 parent b11aced
commit 162c88d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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{