From b71d6ceb7e81b7df32147651a6b0db9be2733197 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Mon, 1 May 2017 12:39:50 +0200 Subject: [PATCH] Update build tools --- .travis.yml | 4 ++-- build.gradle | 6 +++--- extern/GmsApi | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 612507ec..8d79a24e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ script: android: components: - tools - - build-tools-24.0.3 - - android-24 + - build-tools-25.0.2 + - android-25 - extra-android-m2repository before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock diff --git a/build.gradle b/build.gradle index be127829..5412a4de 100644 --- a/build.gradle +++ b/build.gradle @@ -19,17 +19,17 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:2.3.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' } } allprojects { apply plugin: 'idea' - ext.androidBuildVersionTools = "24.0.3" + ext.androidBuildVersionTools = "25.0.2" } -def androidCompileSdk() { return 24 } +def androidCompileSdk() { return 25 } def androidTargetSdk() { return 24 } diff --git a/extern/GmsApi b/extern/GmsApi index 3f1fa813..e2fc0bd8 160000 --- a/extern/GmsApi +++ b/extern/GmsApi @@ -1 +1 @@ -Subproject commit 3f1fa81390d67053d3aa50b0bc3537953396bcf6 +Subproject commit e2fc0bd8284d276f85c863bf723d8133a5c6fe13 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2b30f04c..654f05ca 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -14,9 +14,9 @@ # limitations under the License. # -#Wed Jan 14 11:55:04 CET 2015 +#Sat Apr 22 15:09:21 CEST 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