From c69c358bac349e32c4af522bd0c552e22df10ce9 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 29 Sep 2017 13:28:30 +0200 Subject: [PATCH] upgraded build tools and gradle file --- .travis.yml | 3 +-- build.gradle | 17 ++++++++++------- libs/MemorizingTrustManager/build.gradle | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index f395eb317..2ff4f8c55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,8 @@ android: components: - platform-tools - tools - - build-tools-26.0.1 + - build-tools-26.0.2 - android-25 - - extra-google-m2repository - extra-google-google_play_services licenses: - '.+' diff --git a/build.gradle b/build.gradle index c12fc522e..b8dbb30b4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,6 @@ buildscript { repositories { jcenter() - mavenCentral() - maven { - url 'https://maven.google.com' - } } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' @@ -18,19 +14,26 @@ apply plugin: 'com.android.application' repositories { jcenter() mavenCentral() + maven { + url 'https://maven.google.com' + } } configurations { playstoreCompile } +ext { + supportLibVersion = '25.4.0' +} + dependencies { compile project(':libs:MemorizingTrustManager') playstoreCompile 'com.google.android.gms:play-services-gcm:11.0.4' compile 'org.sufficientlysecure:openpgp-api:10.0' compile 'com.soundcloud.android:android-crop:1.0.1@aar' - compile 'com.android.support:support-v13:25.3.1' - compile 'com.android.support:appcompat-v7:25.3.1' + compile "com.android.support:support-v13:$supportLibVersion" + compile "com.android.support:appcompat-v7:$supportLibVersion" compile 'org.bouncycastle:bcprov-jdk15on:1.52' compile 'org.bouncycastle:bcmail-jdk15on:1.52' compile 'org.jitsi:org.otr4j:0.22' @@ -57,7 +60,7 @@ ext { android { compileSdkVersion 25 - buildToolsVersion "26.0.1" + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 14 diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle index 5fbcd8f83..df988a090 100644 --- a/libs/MemorizingTrustManager/build.gradle +++ b/libs/MemorizingTrustManager/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 25 - buildToolsVersion "26.0.1" + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 14 targetSdkVersion 25