diff --git a/.gitignore b/.gitignore index e658c17679..cfa73a21a5 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ logs/ /core/assets/version.properties /core/assets/locales /ios/src/io/anuke/mindustry/gen/ +/core/src/io/anuke/mindustry/gen/ *.gif version.properties diff --git a/build.gradle b/build.gradle index d16c36a4a5..8bc3fca889 100644 --- a/build.gradle +++ b/build.gradle @@ -120,7 +120,7 @@ project(":ios") { } } - build.dependsOn(copyGen) + //build.dependsOn(copyGen) dependencies { compile project(":core") @@ -131,6 +131,7 @@ project(":ios") { compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios" compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios" + compileOnly project(":annotations") } } diff --git a/core/src/Mindustry.gwt.xml b/core/src/Mindustry.gwt.xml deleted file mode 100644 index 828369ac80..0000000000 --- a/core/src/Mindustry.gwt.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index bc072235db..abd81b462c 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -34,6 +34,8 @@ UIRequiresFullScreen + LSSupportsOpeningDocumentsInPlace + NSPhotoLibraryAddUsageDescription Mindustry UIDeviceFamily diff --git a/ios/robovm.properties b/ios/robovm.properties index 24b6483340..f6b10f99b5 100644 --- a/ios/robovm.properties +++ b/ios/robovm.properties @@ -2,5 +2,5 @@ app.version=4.0 app.id=io.anuke.mindustry app.mainclass=io.anuke.mindustry.IOSLauncher app.executable=IOSLauncher -app.build=23 +app.build=25 app.name=Mindustry diff --git a/ios/robovm.xml b/ios/robovm.xml index 851c59da6f..efa0df89f0 100644 --- a/ios/robovm.xml +++ b/ios/robovm.xml @@ -18,6 +18,7 @@ + net.jpountz.lz4.** io.anuke.ucore.scene.** io.anuke.mindustry.gen.Call io.anuke.mindustry.net.**