Merge branch 'gradle-2.14.1' into 'master'

Upgrade gradle to 2.14.1 and gradle plugin to 2.1.3.



See merge request !292
This commit is contained in:
Torsten Grote
2016-08-24 13:44:47 +00:00
2 changed files with 3 additions and 3 deletions

View File

@@ -14,7 +14,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'de.undercouch:gradle-download-task:2.1.0'
classpath files('briar-core/libs/gradle-witness.jar')

View File

@@ -1,6 +1,6 @@
#Thu May 12 13:08:34 BST 2016
#Wed Aug 24 10:55:42 BST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip