diff --git a/android/build.gradle b/android/build.gradle index bcbee11fa3..980a2f7221 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -50,8 +50,8 @@ task deploy(type: Copy){ } android{ - buildToolsVersion '29.0.2' - compileSdkVersion 29 + buildToolsVersion '28.0.3' + compileSdkVersion 28 sourceSets{ main{ manifest.srcFile 'AndroidManifest.xml' @@ -70,12 +70,12 @@ android{ } defaultConfig{ - Integer vcode = new Properties().with{p -> p.load(new FileInputStream(file('../core/assets/version.properties'))); return p }['androidBuildCode'].toInteger() + Integer vcode = new Properties().with{p -> p.load(new FileInputStream(file('../core/assets/version.properties'))); return p }['androidBuildCode']?.toInteger() ?: 1 def versionNameResult = "$versionNumber-$versionType-${getBuildVersion().replace(" ", "-")}" applicationId "io.anuke.mindustry" minSdkVersion 14 - targetSdkVersion 29 + targetSdkVersion 28 versionName versionNameResult versionCode vcode diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 0809b6b252..3856ebe903 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -175,15 +175,6 @@ public class Control implements ApplicationListener, Loadable{ saves.load(); } - @Override - public void loadSync(){ - if(android){ - //Sounds.empty.loop(0f, 1f, 0f); - - checkClassicData(); - } - } - //checks for existing 3.5 app data, android only public void checkClassicData(){ try{ @@ -381,6 +372,11 @@ public class Control implements ApplicationListener, Loadable{ dialog.show(); })); } + + if(android){ + Sounds.empty.loop(0f, 1f, 0f); + checkClassicData(); + } } @Override