diff --git a/build.gradle b/build.gradle index 507c075927..a1fc7f6031 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript{ } dependencies{ - classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7' + classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8-SNAPSHOT' classpath "com.badlogicgames.gdx:gdx-tools:1.9.10" classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT" } @@ -25,7 +25,7 @@ allprojects{ if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' gdxVersion = '1.9.10' - roboVMVersion = '2.3.7' + roboVMVersion = '2.3.8-SNAPSHOT' steamworksVersion = '1.8.0' arcHash = null @@ -166,13 +166,14 @@ project(":ios"){ def props = new Properties() if(vfile.exists()){ props.load(new FileInputStream(vfile)) + }else{ + props['app.id'] = 'io.anuke.mindustry' + props['app.version'] = '4.2.1' + props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher' + props['app.executable'] = 'IOSLauncher' + props['app.name'] = 'Mindustry' } - - props['app.id'] = 'io.anuke.mindustry' - props['app.version'] = '4.2.1' - props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher' - props['app.executable'] = 'IOSLauncher' - props['app.name'] = 'Mindustry' + props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + "" props.store(vfile.newWriter(), null) } diff --git a/ios/src/io/anuke/mindustry/IOSLauncher.java b/ios/src/io/anuke/mindustry/IOSLauncher.java index 65658f483b..72588f1296 100644 --- a/ios/src/io/anuke/mindustry/IOSLauncher.java +++ b/ios/src/io/anuke/mindustry/IOSLauncher.java @@ -12,6 +12,7 @@ import io.anuke.mindustry.game.Saves.*; import io.anuke.mindustry.io.*; import io.anuke.mindustry.mod.*; import io.anuke.mindustry.ui.*; +import org.robovm.apple.dispatch.*; import org.robovm.apple.foundation.*; import org.robovm.apple.uikit.*; import org.robovm.objc.block.*; @@ -89,9 +90,10 @@ public class IOSLauncher extends IOSApplication.Delegate{ } cont.setDelegate(new ChooserDelegate()); - UIApplication.getSharedApplication().getKeyWindow().getRootViewController().presentViewController(cont, true, () -> { - }); + // DispatchQueue.getMainQueue().sync(() -> { + UIApplication.getSharedApplication().getKeyWindow().getRootViewController().presentViewController(cont, true, () -> {}); + // }); } @Override @@ -102,10 +104,12 @@ public class IOSLauncher extends IOSApplication.Delegate{ NSURL url = new NSURL(to.file()); UIActivityViewController p = new UIActivityViewController(Collections.singletonList(url), null); - p.getPopoverPresentationController().setSourceView(UIApplication.getSharedApplication().getKeyWindow().getRootViewController().getView()); + //p.getPopoverPresentationController().setSourceView(UIApplication.getSharedApplication().getKeyWindow().getRootViewController().getView()); + //DispatchQueue.getMainQueue().sync(() -> { UIApplication.getSharedApplication().getKeyWindow().getRootViewController() - .presentViewController(p, true, () -> io.anuke.arc.util.Log.info("Success! Presented {0}", to)); + .presentViewController(p, true, () -> Log.info("Success! Presented {0}", to)); + //}); } @Override