aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.gradle4
m---------extern/KeybaseLib0
m---------extern/StickyListHeaders0
m---------extern/SuperToasts0
m---------extern/TokenAutoComplete0
m---------extern/minidns0
m---------extern/openkeychain-api-lib0
m---------extern/openpgp-api-lib0
m---------extern/zxing-android-integration0
m---------extern/zxing-qr-code0
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin50557 -> 51018 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
12 files changed, 4 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle
index 2e7ab3d86..59f05e73a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,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:0.12.2'
+ classpath 'com.android.tools.build:gradle:1.0.0-rc3'
}
}
@@ -16,7 +16,7 @@ allprojects {
}
task wrapper(type: Wrapper) {
- gradleVersion = '1.12'
+ gradleVersion = '2.2.1'
}
subprojects {
diff --git a/extern/KeybaseLib b/extern/KeybaseLib
-Subproject 7f4980f0789d7bb3c2124080f32b3bec703c576
+Subproject 2b26d163df84a3d26c1c8da088ed3811b5ca6ec
diff --git a/extern/StickyListHeaders b/extern/StickyListHeaders
-Subproject 911f8ddfd007ce65aededae7e7b79e5a8d903a4
+Subproject 62cc58c12d0c09b50984caf26e5afceda887378
diff --git a/extern/SuperToasts b/extern/SuperToasts
-Subproject 8578cfe6917cf16a9f123c1964e4bbff2a15be5
+Subproject 77042d633f4dd430bcc86101e31dda52433db9c
diff --git a/extern/TokenAutoComplete b/extern/TokenAutoComplete
-Subproject 000fa65390b98106201a0ffaad76c5d85a35396
+Subproject ca46b4261c97221ddd4db135e7838d6fa145adf
diff --git a/extern/minidns b/extern/minidns
-Subproject 118fefcaaa44a7f31f5c18fa7e477f1665f654b
+Subproject f3a19080f15e220fbacab5045c1f15fd12513b3
diff --git a/extern/openkeychain-api-lib b/extern/openkeychain-api-lib
-Subproject 57e58e7f7f51c4eecd7ee4b0f22c856485a243b
+Subproject 0cdbf32231739eac47999be71d6d01fc2837518
diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib
-Subproject 0be263d5d3effd2df5f976fa4a127017268749c
+Subproject e0ad1086a55eab66d963b4d5c6ca5544b454ef2
diff --git a/extern/zxing-android-integration b/extern/zxing-android-integration
-Subproject 1d787845663fd232f98f5e8e0923733c1a188f2
+Subproject e2d0064bd3171b7333af044bb30c25c85ee993d
diff --git a/extern/zxing-qr-code b/extern/zxing-qr-code
-Subproject 9ef2f3b66ea7cc283e865ec39434d023a18d17f
+Subproject 8fd0657d33d8277aadbdc1604fd3aaa2e8d4b48
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 583859812..c97a8bdb9 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cc3d5d9a3..120a028f4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 09 22:04:23 CEST 2014
+#Thu Dec 04 18:50:40 CET 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip