From 0e12e53ccf299d5262ff93ac464c2b05ca08975f Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 3 Aug 2017 10:33:50 +0200
Subject: updated build tools and some library versions

---
 build.gradle                             | 20 ++++++++++----------
 libs/MemorizingTrustManager/build.gradle |  8 ++++----
 libs/android-transcoder/build.gradle     |  6 +++---
 libs/audiowife/build.gradle              |  6 +++---
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index f06c70202..df392613a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
@@ -31,7 +31,7 @@ dependencies {
     compile project(':libs:MemorizingTrustManager')
     compile project(':libs:audiowife')
     compile project(':libs:android-transcoder')
-    standardPushCompile 'com.google.android.gms:play-services-gcm:10.2.6'
+    standardPushCompile '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'
@@ -45,7 +45,7 @@ dependencies {
     compile 'de.timroes.android:EnhancedListView:0.3.4'
     compile 'me.leolin:ShortcutBadger:1.1.17@aar'
     compile 'com.kyleduo.switchbutton:library:1.2.8'
-    compile 'org.whispersystems:signal-protocol-java:2.5.3'
+    compile 'org.whispersystems:signal-protocol-java:2.6.2'
     compile 'com.makeramen:roundedimageview:2.3.0'
     compile 'jetty:javax.servlet:5.1.12'
     compile 'com.google.code.gson:gson:2.7'
@@ -56,8 +56,8 @@ dependencies {
     compile 'com.github.bumptech.glide:glide:3.8.0'
     compile 'com.github.chrisbanes:PhotoView:2.0.0'
     compile 'com.github.rtoshiro.fullscreenvideoview:fullscreenvideoview:1.1.2'
-    compile 'com.google.android.gms:play-services-location:10.2.6'
-    compile 'com.google.android.gms:play-services-maps:10.2.6'
+    compile 'com.google.android.gms:play-services-location:11.0.4'
+    compile 'com.google.android.gms:play-services-maps:11.0.4'
     compile 'pub.devrel:easypermissions:0.4.0'
     compile 'com.wefika:flowlayout:0.4.1'
     compile 'com.googlecode.ez-vcard:ez-vcard:0.10.2'
@@ -69,18 +69,17 @@ dependencies {
 
 ext {
     travisBuild = System.getenv("TRAVIS") == "true"
-    // allows for -Dpre-dex=false to be set
-    preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))
+    preDexEnabled = System.getProperty("pre-dex", "true")
 }
 
 android {
 
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 26
 
         versionCode 199
         versionName "1.18.2"
@@ -98,6 +97,7 @@ android {
         // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
         preDexLibraries = preDexEnabled && !travisBuild
         javaMaxHeapSize "4g"
+        jumboMode true
     }
 
     compileOptions {
diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle
index 1823074dd..37ca64641 100644
--- a/libs/MemorizingTrustManager/build.gradle
+++ b/libs/MemorizingTrustManager/build.gradle
@@ -4,18 +4,18 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
     }
 
     sourceSets {
diff --git a/libs/android-transcoder/build.gradle b/libs/android-transcoder/build.gradle
index d70d2cacc..7f562554c 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 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.1'
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 25
+        targetSdkVersion 26
     }
 
     buildTypes {
diff --git a/libs/audiowife/build.gradle b/libs/audiowife/build.gradle
index 9460ac0c2..883d7aab1 100644
--- a/libs/audiowife/build.gradle
+++ b/libs/audiowife/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
-- 
cgit v1.2.3