From 51475d600c743b7bf00386c89ea0b424b3b4a29f Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 30 Nov 2018 17:48:09 -0500 Subject: [PATCH] iOS fix --- build.gradle | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 562a981a97..ba398346bf 100644 --- a/build.gradle +++ b/build.gradle @@ -104,17 +104,19 @@ project(":ios") { apply plugin: "robovm" task copyGen{ - copy{ - from ("core/build/classes/java/main/io/anuke/mindustry/gen/"){ - include "**/*.java" - } + doLast { + copy { + from("../core/build/classes/java/main/io/anuke/mindustry/gen/") { + include "**/*.java" + } - into "core/src/io/anuke/mindustry/gen" + into "../core/src/io/anuke/mindustry/gen" + } } doFirst{ delete{ - delete "core/src/io/anuke/mindustry/gen/" + delete "../core/src/io/anuke/mindustry/gen/" } } } @@ -132,7 +134,7 @@ project(":ios") { props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher' props['app.executable'] = 'IOSLauncher' props['app.name'] = 'Mindustry' - props['app.build'] = (!props.hasProperty("app.build") ? 40 : props['app.build'].toInteger() + 1)+"" + props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1)+"" props.store(vfile.newWriter(), null) } @@ -148,7 +150,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") + //compileOnly project(":annotations") } }