From 56402b9d6f069319bdae6f31c0a4cfb702757058 Mon Sep 17 00:00:00 2001 From: Carter Gale Date: Thu, 21 Dec 2017 13:45:25 -0800 Subject: [PATCH 1/2] Update build.gradle --- build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 82d955639d..1ac0d7e99d 100644 --- a/build.gradle +++ b/build.gradle @@ -80,7 +80,11 @@ project(":core") { apply plugin: "java" dependencies { - compile 'com.github.anuken:ucore:7938cb4bf9' + if(new File('../uCore-master').exists()){ + compile project(":uCore") + }else{ + compile 'com.github.anuken:ucore:7938cb4bf9' + } compile "com.badlogicgames.gdx:gdx:$gdxVersion" compile "com.badlogicgames.gdx:gdx-ai:1.8.1" } From 8f929bae233e709f36d85a3af231ef3f5782f288 Mon Sep 17 00:00:00 2001 From: Carter Gale Date: Thu, 21 Dec 2017 13:46:33 -0800 Subject: [PATCH 2/2] Update settings.gradle --- settings.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/settings.gradle b/settings.gradle index e90e722ddb..37e8392bdd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,6 @@ include 'desktop', 'html', 'core', 'android' + +if (new File(settingsDir, '../uCore-master').exists()) { + include ':uCore' + project(':uCore').projectDir = new File(settingsDir, '../uCore-master') +}