From 115c46d015bbbbcf6223d3e13844daa98d12255c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 12 Apr 2016 19:28:00 +0200 Subject: Update Android Gradle Plugin to 2.0 with workarounds --- settings.gradle | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'settings.gradle') diff --git a/settings.gradle b/settings.gradle index 2d8a34da7..29532fbe1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,17 @@ include ':OpenKeychain' -include ':extern:openpgp-api-lib:openpgp-api' -include ':extern:openkeychain-api-lib:openkeychain-intents' include ':extern:bouncycastle:core' include ':extern:bouncycastle:pg' include ':extern:bouncycastle:prov' include ':extern:minidns' include ':extern:KeybaseLib:Lib' -include ':extern:safeslinger-exchange:safeslinger-exchange' + +// Workaround for Android Gradle Plugin 2.0, as described in http://stackoverflow.com/a/36544850 +//include ':extern:safeslinger-exchange:safeslinger-exchange' +include ':safeslinger-exchange' +project(':safeslinger-exchange').projectDir = new File('extern/safeslinger-exchange/safeslinger-exchange') +//include ':extern:openkeychain-api-lib:openkeychain-intents' +include ':openkeychain-api-lib' +project(':openkeychain-api-lib').projectDir = new File('extern/openkeychain-api-lib/openkeychain-intents') +//include ':extern:openpgp-api-lib:openpgp-api' +include ':openpgp-api-lib' +project(':openpgp-api-lib').projectDir = new File('extern/openpgp-api-lib/openpgp-api') \ No newline at end of file -- cgit v1.2.3