Update Android Gradle Plugin to 2.0 with workarounds
This commit is contained in:
parent
060a5a1815
commit
115c46d015
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
6
gradle/wrapper/gradle-wrapper.properties
vendored
6
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -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
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
|
||||
distributionSha256Sum=d8b1948a575dc9ec13e03db94502ce91815d73da023f611296c04b852164cb5f
|
10
gradlew
vendored
10
gradlew
vendored
|
@ -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`
|
||||
|
|
2
gradlew.bat
vendored
2
gradlew.bat
vendored
|
@ -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
|
||||
|
|
|
@ -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')
|
Loading…
Reference in a new issue