Building fix
This commit is contained in:
@@ -50,8 +50,8 @@ task deploy(type: Copy){
|
|||||||
}
|
}
|
||||||
|
|
||||||
android{
|
android{
|
||||||
buildToolsVersion '29.0.2'
|
buildToolsVersion '28.0.3'
|
||||||
compileSdkVersion 29
|
compileSdkVersion 28
|
||||||
sourceSets{
|
sourceSets{
|
||||||
main{
|
main{
|
||||||
manifest.srcFile 'AndroidManifest.xml'
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
@@ -70,12 +70,12 @@ android{
|
|||||||
}
|
}
|
||||||
|
|
||||||
defaultConfig{
|
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(" ", "-")}"
|
def versionNameResult = "$versionNumber-$versionType-${getBuildVersion().replace(" ", "-")}"
|
||||||
|
|
||||||
applicationId "io.anuke.mindustry"
|
applicationId "io.anuke.mindustry"
|
||||||
minSdkVersion 14
|
minSdkVersion 14
|
||||||
targetSdkVersion 29
|
targetSdkVersion 28
|
||||||
|
|
||||||
versionName versionNameResult
|
versionName versionNameResult
|
||||||
versionCode vcode
|
versionCode vcode
|
||||||
|
|||||||
@@ -175,15 +175,6 @@ public class Control implements ApplicationListener, Loadable{
|
|||||||
saves.load();
|
saves.load();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void loadSync(){
|
|
||||||
if(android){
|
|
||||||
//Sounds.empty.loop(0f, 1f, 0f);
|
|
||||||
|
|
||||||
checkClassicData();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//checks for existing 3.5 app data, android only
|
//checks for existing 3.5 app data, android only
|
||||||
public void checkClassicData(){
|
public void checkClassicData(){
|
||||||
try{
|
try{
|
||||||
@@ -381,6 +372,11 @@ public class Control implements ApplicationListener, Loadable{
|
|||||||
dialog.show();
|
dialog.show();
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(android){
|
||||||
|
Sounds.empty.loop(0f, 1f, 0f);
|
||||||
|
checkClassicData();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user