Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0

android/build.gradle

@@ -42,18 +42,26 @@ android {
 
     defaultConfig {
         def vfile = file('../core/assets/version.properties')
-        def props = new Properties()
-        props.load(new FileInputStream(vfile))
 
-        def code = props['androidBuildCode'].toInteger() + 1
+        def code = 0
-        props['androidBuildCode'] = code.toString()
+        def versionNameResult = "unknown"
-        props.store(vfile.newWriter(), "Autogenerated file. Do not modify.")
+
+        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(" ", "-")}"
+        }
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 9
         targetSdkVersion 27
         versionCode code
-        versionName "$versionNumber-$versionType-${props['build'].replace(" ", "-")}"
+        versionName versionNameResult
     }
 
     compileOptions {

desktop/build.gradle

@@ -12,6 +12,9 @@ def ICON_DIR = new File("core/assets/sprites/icon.icns")
 ext.writeVersion = {
     def pfile = new File('core/assets/version.properties')
     def props = new Properties()
+
+    pfile.createNewFile()
+
     props.load(new FileInputStream(pfile))
 
     String code = getBuildVersion()