Clean up version and build for Forge

DynmapCore/build.gradle

@@ -38,6 +38,7 @@ shadowJar {
 		include(dependency('com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:'))
         include(dependency('org.eclipse.jetty::'))
         include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
+        include(dependency(':DynmapCoreAPI'))
 	}
 	relocate('org.json.simple', 'org.dynmap.json.simple')
 	relocate('org.yaml.snakeyaml', 'org.dynmap.snakeyaml')

bukkit-helper-113-1/build.gradle

@@ -3,7 +3,7 @@ description = 'bukkit-helper-1.13.1'
 
 dependencies {
   compile project(':bukkit-helper')
-  compile project(path: ':dynmap-api', configuration: 'shadow')
+  compile project(':dynmap-api')
   compile project(path: ':DynmapCore', configuration: 'shadow')
   compile group: 'org.bukkit', name: 'bukkit', version:'1.13.1-R0.1-SNAPSHOT'
   compile group: 'org.bukkit', name: 'craftbukkit', version:'1.13.1-R0.1-SNAPSHOT'

bukkit-helper-113/build.gradle

@@ -3,7 +3,7 @@ description = 'bukkit-helper-1.13'
 
 dependencies {
   compile project(':bukkit-helper')
-  compile project(path: ':dynmap-api', configuration: 'shadow')
+  compile project(':dynmap-api')
   compile project(path: ':DynmapCore', configuration: 'shadow')
   compile group: 'org.bukkit', name: 'bukkit', version:'1.13-R0.1-SNAPSHOT'
   compile group: 'org.bukkit', name: 'craftbukkit', version:'1.13-R0.1-SNAPSHOT'

bukkit-helper/build.gradle

@@ -2,7 +2,7 @@
 description = 'bukkit-helper'
 
 dependencies {
-  compile project(path: ':dynmap-api', configuration: 'shadow')
+  compile project(':dynmap-api')
   compile project(path: ':DynmapCore', configuration: 'shadow')
   compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
   compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2'

forge-1.10.2/build.gradle

@@ -16,7 +16,6 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
-    compile project(path: ":DynmapCoreAPI", configuration: "shadow")
     compile project(path: ":DynmapCore", configuration: "shadow")
 }
 
@@ -34,6 +33,9 @@ minecraft {
     version = "1.10.2-12.18.3.2316"
     mappings = "snapshot_20160922"
     runDir = 'run'
+    replaceIn "Version.java"
+    replace "@VERSION@", project.version + '-' + project.ext.buildNumber
+    replace "@BUILD_NUMBER@", project.ext.buildNumber    
 }
 
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.10.2"
@@ -62,7 +64,6 @@ processResources
 shadowJar {
     dependencies {
         include(dependency(':DynmapCore'))
-        include(dependency(':DynmapCoreAPI'))
     }
     archiveName = "Dynmap-${parent.version}-forge-1.10.2.jar"
     destinationDir = file '../target'

forge-1.11.2/build.gradle

@@ -16,7 +16,6 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
-    compile project(path: ":DynmapCoreAPI", configuration: "shadow")
     compile project(path: ":DynmapCore", configuration: "shadow")
 }
 
@@ -34,6 +33,9 @@ minecraft {
     version = "1.11.2-13.20.0.2315"
     mappings = "snapshot_20170505"
     runDir = 'run'
+    replaceIn "Version.java"
+    replace "@VERSION@", project.version + '-' + project.ext.buildNumber
+    replace "@BUILD_NUMBER@", project.ext.buildNumber
 }
 
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.11.2"
@@ -62,7 +64,6 @@ processResources
 shadowJar {
     dependencies {
         include(dependency(':DynmapCore'))
-        include(dependency(':DynmapCoreAPI'))
     }
     archiveName = "Dynmap-${parent.version}-forge-1.11.2.jar"
     destinationDir = file '../target'

forge-1.12.2/build.gradle

@@ -34,6 +34,9 @@ minecraft {
     version = "1.12.2-14.23.4.2705"
     mappings = "snapshot_20171031"
     runDir = 'run'
+    replaceIn "Version.java"
+    replace "@VERSION@", project.version + '-' + project.ext.buildNumber
+    replace "@BUILD_NUMBER@", project.ext.buildNumber
 }
 
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.12.2"
@@ -62,7 +65,6 @@ processResources
 shadowJar {
     dependencies {
         include(dependency(':DynmapCore'))
-        include(dependency(':DynmapCoreAPI'))
     }
     archiveName = "Dynmap-${parent.version}-forge-1.12.2.jar"
     destinationDir = file '../target'

forge-1.8.9/build.gradle

@@ -16,7 +16,6 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
-    compile project(path: ":DynmapCoreAPI", configuration: "shadow")
     compile project(path: ":DynmapCore", configuration: "shadow")
 }
 
@@ -34,6 +33,9 @@ minecraft {
     version = "1.8.9-11.15.1.1902-1.8.9"
     mappings = "stable_22"
     runDir = 'run'
+    replaceIn "Version.java"
+    replace "@VERSION@", project.version + '-' + project.ext.buildNumber
+    replace "@BUILD_NUMBER@", project.ext.buildNumber
 }
 
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.8.9"
@@ -62,7 +64,6 @@ processResources
 shadowJar {
     dependencies {
         include(dependency(':DynmapCore'))
-        include(dependency(':DynmapCoreAPI'))
     }
     archiveName = "Dynmap-${parent.version}-forge-1.8.9.jar"
     destinationDir = file '../target'

forge-1.9.4/build.gradle

@@ -16,7 +16,6 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
-    compile project(path: ":DynmapCoreAPI", configuration: "shadow")
     compile project(path: ":DynmapCore", configuration: "shadow")
 }
 
@@ -34,6 +33,9 @@ minecraft {
     version = "1.9.4-12.17.0.2051"
     mappings = "snapshot_20160522"
     runDir = 'run'
+    replaceIn "Version.java"
+    replace "@VERSION@", project.version + '-' + project.ext.buildNumber
+    replace "@BUILD_NUMBER@", project.ext.buildNumber
 }
 
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.9.4"
@@ -62,7 +64,6 @@ processResources
 shadowJar {
     dependencies {
         include(dependency(':DynmapCore'))
-        include(dependency(':DynmapCoreAPI'))
     }
     archiveName = "Dynmap-${parent.version}-forge-1.9.4.jar"
     destinationDir = file '../target'

spigot/build.gradle

@@ -4,7 +4,7 @@ description = 'dynmap'
 dependencies {
   compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
     compile 'com.nijikokun.bukkit:Permissions:3.1.6'
-    compile project(path: ":dynmap-api", configuration: "shadow")
+    compile project(":dynmap-api")
     compile project(path: ":DynmapCore", configuration: "shadow")
     compile group: 'ru.tehkode', name: 'PermissionsEx', version:'1.19.1'
     compile group: 'de.bananaco', name: 'bPermissions', version:'2.9.1'