aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-01-09 21:49:08 +0100
committerChristian Schneppe <christian@pix-art.de>2017-01-09 21:49:08 +0100
commitd798cf0e594d6f55c968dedeb429bf52cd789057 (patch)
tree717fdc87db959e5ce72d4edc5c4fac4a96cfc7a6
parent891ea070f92a1363b6cdffd9c7fb0d7e1b234e52 (diff)
update gradle files
-rw-r--r--.travis.yml7
-rw-r--r--build.gradle22
-rw-r--r--libs/MemorizingTrustManager/build.gradle8
-rw-r--r--libs/audiowife/build.gradle6
-rw-r--r--libs/emojicon/build.gradle10
5 files changed, 27 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml
index 45227d224..0062015de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,12 @@
language: android
+jdk:
+ - oraclejdk8
android:
components:
- platform-tools
- tools
- - build-tools-23.0.3
- - build-tools-19.1.0
- - android-24
+ - build-tools-25.0.2
+ - android-25
- extra-android-m2repository
- extra-google-m2repository
- extra-google-google_play_services
diff --git a/build.gradle b/build.gradle
index f5964de6a..863c70814 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,10 +33,10 @@ dependencies {
compile project(':libs:emojicon')
compile files('libs/aspectjrt-1.7.3.jar')
compile files('libs/isoparser-1.0.6.jar')
- playstoreCompile 'com.google.android.gms:play-services-gcm:9.6.1'
+ playstoreCompile 'com.google.android.gms:play-services-gcm:10.0.1'
compile 'org.sufficientlysecure:openpgp-api:10.0'
compile 'com.soundcloud.android:android-crop:1.0.1@aar'
- compile 'com.android.support:support-v13:24.2.1'
+ compile 'com.android.support:support-v13:25.1.0'
compile 'org.bouncycastle:bcprov-jdk15on:1.52'
compile 'org.bouncycastle:bcmail-jdk15on:1.52'
compile 'org.jitsi:org.otr4j:0.22'
@@ -52,13 +52,13 @@ dependencies {
compile 'jetty:javax.servlet:5.1.12'
compile 'com.google.code.gson:gson:2.4'
compile 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
- compile 'com.android.support:appcompat-v7:24.2.1'
+ compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:multidex:1.0.1'
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'com.github.chrisbanes:PhotoView:1.3.0'
compile 'com.github.rtoshiro.fullscreenvideoview:fullscreenvideoview:1.1.2'
- compile 'com.google.android.gms:play-services-location:9.6.1'
- compile 'com.google.android.gms:play-services-maps:9.6.1'
+ compile 'com.google.android.gms:play-services-location:10.0.1'
+ compile 'com.google.android.gms:play-services-maps:10.0.1'
compile 'pub.devrel:easypermissions:0.1.9'
compile 'com.wefika:flowlayout:0.4.1'
compile 'com.googlecode.ez-vcard:ez-vcard:0.10.0'
@@ -72,16 +72,16 @@ ext {
android {
- compileSdkVersion 24
- buildToolsVersion "23.0.3"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.2"
defaultConfig {
minSdkVersion 14
- targetSdkVersion 24
+ targetSdkVersion 25
- versionCode 181
- versionName "1.15.4"
- //versionName "1.15.4 beta (2016-12-24)"
+ versionCode 182
+ //versionName "1.15.4"
+ versionName "1.15.5 beta (2017-01-09)"
archivesBaseName += "-$versionName"
applicationId "de.pixart.messenger"
diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle
index 46d464a33..beac27f82 100644
--- a/libs/MemorizingTrustManager/build.gradle
+++ b/libs/MemorizingTrustManager/build.gradle
@@ -3,18 +3,18 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.0.0'
+ classpath 'com.android.tools.build:gradle:2.2.3'
}
}
apply plugin: 'com.android.library'
android {
- compileSdkVersion 24
- buildToolsVersion "23.0.3"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.2"
defaultConfig {
minSdkVersion 14
- targetSdkVersion 24
+ targetSdkVersion 25
}
sourceSets {
diff --git a/libs/audiowife/build.gradle b/libs/audiowife/build.gradle
index 15adabe9f..9460ac0c2 100644
--- a/libs/audiowife/build.gradle
+++ b/libs/audiowife/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 23
- buildToolsVersion "23.0.3"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.2"
defaultConfig {
minSdkVersion 14
- targetSdkVersion 21
+ targetSdkVersion 25
versionCode 1
versionName "1.0"
}
diff --git a/libs/emojicon/build.gradle b/libs/emojicon/build.gradle
index 03c97e2b0..312889758 100644
--- a/libs/emojicon/build.gradle
+++ b/libs/emojicon/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 19
- buildToolsVersion "19.1.0"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.2"
defaultConfig {
- minSdkVersion 8
- targetSdkVersion 19
+ minSdkVersion 14
+ targetSdkVersion 25
}
buildTypes {
@@ -18,5 +18,5 @@ android {
}
dependencies {
- compile 'com.android.support:support-v4:19.+'
+ compile 'com.android.support:support-v4:25.1.0'
}