upgraded build tools and gradle file

This commit is contained in:
Daniel Gultsch 2017-09-29 13:28:30 +02:00
parent 0cdcafe745
commit c69c358bac
3 changed files with 12 additions and 10 deletions

View file

@ -5,9 +5,8 @@ android:
components: components:
- platform-tools - platform-tools
- tools - tools
- build-tools-26.0.1 - build-tools-26.0.2
- android-25 - android-25
- extra-google-m2repository
- extra-google-google_play_services - extra-google-google_play_services
licenses: licenses:
- '.+' - '.+'

View file

@ -3,10 +3,6 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
mavenCentral()
maven {
url 'https://maven.google.com'
}
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:2.3.3'
@ -18,19 +14,26 @@ apply plugin: 'com.android.application'
repositories { repositories {
jcenter() jcenter()
mavenCentral() mavenCentral()
maven {
url 'https://maven.google.com'
}
} }
configurations { configurations {
playstoreCompile playstoreCompile
} }
ext {
supportLibVersion = '25.4.0'
}
dependencies { dependencies {
compile project(':libs:MemorizingTrustManager') compile project(':libs:MemorizingTrustManager')
playstoreCompile 'com.google.android.gms:play-services-gcm:11.0.4' playstoreCompile 'com.google.android.gms:play-services-gcm:11.0.4'
compile 'org.sufficientlysecure:openpgp-api:10.0' compile 'org.sufficientlysecure:openpgp-api:10.0'
compile 'com.soundcloud.android:android-crop:1.0.1@aar' compile 'com.soundcloud.android:android-crop:1.0.1@aar'
compile 'com.android.support:support-v13:25.3.1' compile "com.android.support:support-v13:$supportLibVersion"
compile 'com.android.support:appcompat-v7:25.3.1' compile "com.android.support:appcompat-v7:$supportLibVersion"
compile 'org.bouncycastle:bcprov-jdk15on:1.52' compile 'org.bouncycastle:bcprov-jdk15on:1.52'
compile 'org.bouncycastle:bcmail-jdk15on:1.52' compile 'org.bouncycastle:bcmail-jdk15on:1.52'
compile 'org.jitsi:org.otr4j:0.22' compile 'org.jitsi:org.otr4j:0.22'
@ -57,7 +60,7 @@ ext {
android { android {
compileSdkVersion 25 compileSdkVersion 25
buildToolsVersion "26.0.1" buildToolsVersion "26.0.2"
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14

View file

@ -12,7 +12,7 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 25 compileSdkVersion 25
buildToolsVersion "26.0.1" buildToolsVersion "26.0.2"
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 25 targetSdkVersion 25