Change to nightly version naming (version+hash style) and processTestRes

Author: robotgryphon

build.gradle

@@ -20,7 +20,7 @@ apply plugin: "net.minecraftforge.gradle"
 def gitCommitHash = 'git rev-parse --verify --short HEAD'.execute().text.trim()
 def isRelease = (System.getenv("CM_RELEASE") ?: "false").equalsIgnoreCase("true")
 
-version = isRelease ? mod_version : "nightly-${gitCommitHash}"
+version = isRelease ? mod_version : "${mod_version}+${gitCommitHash}"
 group = "dev.compactmods"
 archivesBaseName = mod_id
 
@@ -259,6 +259,10 @@ processResources {
     duplicatesStrategy = DuplicatesStrategy.WARN
 }
 
+processTestResources {
+    duplicatesStrategy = DuplicatesStrategy.WARN
+}
+
 jar {
     from sourceSets.api.output
     from sourceSets.main.output
@@ -271,7 +275,7 @@ jar {
                 "Specification-Vendor"    : "robotgryphon",
                 "Specification-Version"   : "1", // We are version 1 of ourselves
                 "Implementation-Title"    : project.name,
-                "Implementation-Version"  : isRelease ? archiveVersion : "nightly-${gitCommitHash}",
+                "Implementation-Version"  : isRelease ? archiveVersion : "${mod_version}+${gitCommitHash}",
                 "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }