Merge branch 'develop' into overwrite_preference

This commit is contained in:
Mark Gillespie 2017-01-24 08:38:12 +00:00
commit 180fdb0e59
2 changed files with 3 additions and 3 deletions

View file

@ -29,7 +29,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.0-beta2'
}
}

View file

@ -1,6 +1,6 @@
#Fri Nov 25 23:05:46 CET 2016
#Sun Jan 22 21:19:51 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip