build script stuff

TerraForgedAPI/build.gradle

@@ -13,7 +13,7 @@ apply plugin: "net.minecraftforge.gradle"
 apply plugin: "maven-publish"
 apply plugin: "eclipse"
 
-version = "${mc_version}-${version}"
+version = "${mc_version}-${mod_version}"
 archivesBaseName = "TerraForgedAPI"
 
 repositories {

TerraForgedAPI/gradle.properties

@@ -1,7 +0,0 @@
-mod_version=0.0.1-ALPHA
-mc_version=1.15.2
-forge_version=31.0.1
-mcp_channel=snapshot
-mcp_version=20200124-1.15.1
-org.gradle.jvmargs=-Xmx8G
-org.gradle.daemon=false

TerraForgedMod/build.gradle

@@ -13,7 +13,7 @@ apply plugin: "net.minecraftforge.gradle"
 apply plugin: "maven-publish"
 apply plugin: "eclipse"
 
-version = "${mc_version}-${version}${getClassifier()}"
+version = "${mc_version}-${mod_version}${getClassifier()}"
 archivesBaseName = "TerraForged"
 
 repositories {
@@ -84,7 +84,7 @@ processResources {
 
     filesMatching("**/mods.toml") {
         expand(
-                "version": version,
+                "version": "${mod_version}${getClassifier()}",
                 "mc_version": mc_version
         )
     }
@@ -99,9 +99,8 @@ publish {
 }
 
 static def getClassifier() {
-    def buildTag = System.getenv("GIT_TAG_NAME");
-    if (buildTag != null) {
-        return "-${buildTag}"
+    if (System.getenv("GIT_TAG_NAME") != null) {
+        return ""
     }
     def buildNumber = System.getenv("BUILD_NUMBER")
     if (buildNumber != null) {

build.gradle

@@ -1,7 +1,7 @@
 allprojects {
     apply plugin: "java"
     group = "com.terraforged"
-    version = "${version}"
+    version = mod_version
 }
 
 jar.enabled(false)

gradle.properties

@@ -1,4 +1,4 @@
-version=0.0.1
+mod_version=0.0.1
 mc_version=1.15.2
 forge_version=31.1.1
 mcp_channel=snapshot