Update Android Gradle Plugin to 2.0 with workarounds

This commit is contained in:
Dominik Schürmann
2016-04-12 19:28:00 +02:00
parent 060a5a1815
commit 115c46d015
7 changed files with 23 additions and 19 deletions

View File

@@ -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')