Improvements to version scripts

android/build.gradle

@@ -50,8 +50,8 @@ task deploy(type: Copy){
 }
 
 android{
-    buildToolsVersion '28.0.3'
-    compileSdkVersion 28
+    buildToolsVersion '29.0.2'
+    compileSdkVersion 29
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -70,27 +70,15 @@ android{
     }
 
     defaultConfig{
-        def vfile = file('../core/assets/version.properties')
-
-        def code = 0
-        def versionNameResult = "unknown"
-
-        if(vfile.exists()){
-            def props = new Properties()
-            props.load(new FileInputStream(vfile))
-
-            code = (props['androidBuildCode'] == null ? 0 : props['androidBuildCode']).toInteger() + 1
-
-            props['androidBuildCode'] = code.toString()
-            props.store(vfile.newWriter(), "Autogenerated file. Do not modify.")
-            versionNameResult = "$versionNumber-$versionType-${props['build'].replace(" ", "-")}"
-        }
+        Integer vcode = new Properties().with{p -> p.load(new FileInputStream(file('../core/assets/version.properties'))); return p }['androidBuildCode'].toInteger()
+        def versionNameResult = "$versionNumber-$versionType-${getBuildVersion().replace(" ", "-")}"
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 28
-        versionCode code
+        targetSdkVersion 29
+        
         versionName versionNameResult
+        versionCode vcode
     }
 
     compileOptions{

build.gradle

@@ -119,6 +119,7 @@ allprojects{
                 props.load(new FileInputStream(pfile))
 
                 String buildid = getBuildVersion()
+                println("Compiling with build: '$buildid'")
 
                 props["type"] = versionType
                 props["number"] = versionNumber
@@ -199,6 +200,7 @@ project(":core"){
 
     task preGen{
         generateLocales()
+        writeVersion()
     }
 
     dependencies{

server/build.gradle

@@ -44,8 +44,6 @@ task dist(type: Jar){
     exclude("icons/**")
     exclude("bundles/**")
 
-    writeVersion()
-
     manifest{
         attributes 'Main-Class': project.mainClassName
     }

settings.gradle

@@ -5,7 +5,7 @@ def use = { String name ->
     project(name).projectDir = new File(settingsDir, "../${name.substring(1).replace(":", "/")}")
 }
 
-Properties properties = new Properties()
+def properties = new Properties()
 
 if(new File(settingsDir, 'local.properties').exists()){
     properties.load(new File(settingsDir, 'local.properties').newDataInputStream())