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: [PATCH] Update Android Gradle Plugin to 2.0 with workarounds --- OpenKeychain/build.gradle | 6 +++--- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 53323 -> 53639 bytes gradle/wrapper/gradle-wrapper.properties | 6 +++--- gradlew | 10 +++------- gradlew.bat | 2 +- settings.gradle | 14 +++++++++++--- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index f4d18e82d..1ba392560 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -73,14 +73,14 @@ dependencies { compile 'com.fidesmo:nordpol-android:0.1.18' // libs as submodules - compile project(':extern:openpgp-api-lib:openpgp-api') - compile project(':extern:openkeychain-api-lib:openkeychain-intents') + compile project(':openpgp-api-lib') + compile project(':openkeychain-api-lib') compile project(':extern:bouncycastle:core') compile project(':extern:bouncycastle:pg') compile project(':extern:bouncycastle:prov') compile project(':extern:minidns') compile project(':extern:KeybaseLib:Lib') - compile project(':extern:safeslinger-exchange:safeslinger-exchange') + compile project(':safeslinger-exchange') } // Output of ./gradlew -q calculateChecksums diff --git a/build.gradle b/build.gradle index d70fb6a13..0c556795b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { dependencies { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.0.0' classpath files('gradle-witness.jar') // bintray dependency to satisfy dependency of openpgp-api lib classpath 'com.novoda:bintray-release:0.2.7' @@ -27,7 +27,7 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '2.5' + gradleVersion = '2.12' } subprojects { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cb5ccd9f196839dbb7129167dee12924f1036d80..2c6137b87896c8f70315ae454e00a969ef5f6019 100644 GIT binary patch delta 12104 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 delta 11762 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4828f29e8..3bb16075a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Mon Aug 03 18:56:28 CEST 2015 +#Tue Apr 12 19:22:55 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip -distributionSha256Sum=b71ab21fa5e91dcc6a4bd723b13403e8610a6e1b4b9d4b314ff477820de00bf9 \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip +distributionSha256Sum=d8b1948a575dc9ec13e03db94502ce91815d73da023f611296c04b852164cb5f \ No newline at end of file diff --git a/gradlew b/gradlew index 91a7e269e..9d82f7891 100755 --- a/gradlew +++ b/gradlew @@ -42,11 +42,6 @@ case "`uname`" in ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/gradlew.bat b/gradlew.bat index aec99730b..72d362daf 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -46,7 +46,7 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args if "%@eval[2+2]" == "4" goto 4NT_args 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