Merge branch 'develop' into fix-2359

1 files changed, 20 insertions, 16 deletions

diff --git a/build.gradle b/build.gradle
index bc1bb870d..664cecbd9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,23 +1,26 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
+        google()
         jcenter()
         mavenCentral()
-        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
-        classpath "com.github.triplet.gradle:play-publisher:1.2.0"
-        // Exclude the version that the android plugin depends on.
-        configurations.classpath.exclude group: "com.android.tools.external.lombok"
+        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.5'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
+        maven { url "https://jitpack.io" }
+    }
+
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            options.compilerArgs << "-Xlint" << "-Xlint:-deprecation" << "-Xlint:-serial"
+        }
     }
 }
 
@@ -38,18 +41,18 @@ subprojects {
 
 project.ext {
     compileSdkVersion = 26
-    buildToolsVersion = "27.0.3"
     minSdkVersion = 14
     targetSdkVersion = 26
 
-    supportVersion = "26.1.0"
+    supportVersion = "27.1.1"
+    awaitilityVersion = "3.1.2"
     commonsioVersion = "2.5"
     commonslangVersion = "3.6"
     commonstextVersion = "1.3"
     eventbusVersion = "2.4.0"
     flattr4jVersion = "2.14"
-    glideVersion = "3.8.0"
-    glideOkhttpIntegrationVersion = "1.5.0"
+    glideVersion = "4.8.0"
+    glideOkhttpIntegrationVersion = "4.8.0"
     iconifyVersion = "2.2.2"
     jsoupVersion = "1.11.2"
     materialDialogsVersion = "0.9.0.2"
@@ -57,11 +60,12 @@ project.ext {
     okioVersion = "1.14.0"
     recyclerviewFlexibledividerVersion = "1.4.0"
     robotiumSoloVersion = "5.6.3"
-    rxAndroidVersion = "1.2.1"
-    rxJavaVersion = "1.3.8"
+    rxAndroidVersion = "2.1.0"
+    rxJavaVersion = "2.2.2"
     rxJavaRulesVersion = "1.3.3.0"
     triangleLabelViewVersion = "1.1.2"
 
+    exoPlayerVersion = "2.9.3"
     audioPlayerVersion = "v1.0.17"
 
     castCompanionLibVer = "2.9.1"
@@ -69,8 +73,8 @@ project.ext {
     wearableSupportVersion = "2.2.0"
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = "4.4.1"
+wrapper {
+    gradleVersion = "4.10.2"
 }
 
 // free build hack: common functions