diff options
| -rw-r--r-- | build.gradle | 16 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rw-r--r-- | libs/MemorizingTrustManager/build.gradle | 3 | ||||
| -rw-r--r-- | libs/android-transcoder/build.gradle | 6 |
4 files changed, 15 insertions, 14 deletions
diff --git a/build.gradle b/build.gradle index 70d5eb895..f0a0329d9 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.0' } } @@ -32,10 +32,10 @@ dependencies { compile project(':libs:audiowife') compile project(':libs:emojicon') compile project(':libs:android-transcoder') - playstoreCompile 'com.google.android.gms:play-services-gcm:10.0.1' + playstoreCompile 'com.google.android.gms:play-services-gcm:10.2.0' compile 'org.sufficientlysecure:openpgp-api:10.0' compile 'com.soundcloud.android:android-crop:1.0.1@aar' - compile 'com.android.support:support-v13:25.1.1' + compile 'com.android.support:support-v13:25.2.0' compile 'org.bouncycastle:bcprov-jdk15on:1.56' compile 'org.bouncycastle:bcmail-jdk15on:1.56' compile 'org.jitsi:org.otr4j:0.22' @@ -44,20 +44,20 @@ dependencies { compile 'com.google.zxing:android-integration:3.3.0' compile 'de.measite.minidns:minidns:0.1.7' compile 'de.timroes.android:EnhancedListView:0.3.4' - compile 'me.leolin:ShortcutBadger:1.1.11@aar' + compile 'me.leolin:ShortcutBadger:1.1.13@aar' compile 'com.kyleduo.switchbutton:library:1.2.8' compile 'org.whispersystems:axolotl-android:1.4.3' compile 'com.makeramen:roundedimageview:2.3.0' compile 'jetty:javax.servlet:5.1.12' - compile 'com.google.code.gson:gson:2.4' + compile 'com.google.code.gson:gson:2.7' compile 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' - compile 'com.android.support:appcompat-v7:25.1.1' + compile 'com.android.support:appcompat-v7:25.2.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.1' compile 'com.github.rtoshiro.fullscreenvideoview:fullscreenvideoview:1.1.2' - compile 'com.google.android.gms:play-services-location:10.0.1' - compile 'com.google.android.gms:play-services-maps:10.0.1' + compile 'com.google.android.gms:play-services-location:10.2.0' + compile 'com.google.android.gms:play-services-maps:10.2.0' compile 'pub.devrel:easypermissions:0.2.1' compile 'com.wefika:flowlayout:0.4.1' compile 'com.googlecode.ez-vcard:ez-vcard:0.10.1' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7f4cf394..730442ca6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Aug 28 21:54:23 CEST 2016 +#Sat Mar 04 12:24:11 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 diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle index beac27f82..d069d1bcb 100644 --- a/libs/MemorizingTrustManager/build.gradle +++ b/libs/MemorizingTrustManager/build.gradle @@ -1,9 +1,10 @@ buildscript { repositories { mavenCentral() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.0' } } diff --git a/libs/android-transcoder/build.gradle b/libs/android-transcoder/build.gradle index 1b6e8f17c..d70d2cacc 100644 --- a/libs/android-transcoder/build.gradle +++ b/libs/android-transcoder/build.gradle @@ -11,12 +11,12 @@ apply plugin: 'com.android.library' apply plugin: 'bintray-release' android { - compileSdkVersion 24 - buildToolsVersion "24.0.1" + compileSdkVersion 25 + buildToolsVersion '25.0.2' defaultConfig { minSdkVersion 18 - targetSdkVersion 24 + targetSdkVersion 25 } buildTypes { |