Merge branch 'develop' into fix/irreversible_offline_state

android-ddp/build.gradle

 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath 'me.tatarka:gradle-retrolambda:3.6.1'
-        classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
-    }
-}
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion

app/build.gradle

@@ -8,35 +8,10 @@ repositories {
 
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'me.tatarka.retrolambda'
 apply plugin: 'com.jakewharton.hugo'
 apply plugin: 'com.github.triplet.play'
 apply from: '../config/quality/quality.gradle'
 
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-        maven { url 'https://maven.fabric.io/public' }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-        classpath 'me.tatarka:gradle-retrolambda:3.5.0'
-        classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
-        classpath 'io.realm:realm-gradle-plugin:2.3.1'
-        classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
-        classpath 'com.google.gms:google-services:3.0.0'
-        classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
-        classpath 'io.fabric.tools:gradle:1.+'
-    }
-
-    // Exclude the version that the android plugin depends on.
-    configurations.classpath.exclude group: 'com.android.tools.external.lombok'
-}
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -115,7 +90,7 @@ play {
     track = "${track}"
 }
 ext {
-    playLibVersion = '11.0.4'
+    playLibVersion = '11.6.0'
     stethoVersion = '1.5.0'
     stethoOkhttp3Version = '1.5.0'
     stethoRealmVersion = '2.1.0'
@@ -138,7 +113,7 @@ dependencies {
     compile rxbindingDependencies.rxBinding
     compile rxbindingDependencies.rxBindingSupport
     compile rxbindingDependencies.rxBindingAppcompact
-    compile 'com.android.support:multidex:1.0.1'
+    compile 'com.android.support:multidex:1.0.2'
     compile "com.google.firebase:firebase-core:$playLibVersion"
     compile "com.google.firebase:firebase-crash:$playLibVersion"
     compile "com.google.android.gms:play-services-gcm:$playLibVersion"
@@ -150,7 +125,7 @@ dependencies {
     compile "com.trello.rxlifecycle2:rxlifecycle-components:$rxlifecycleVersion"
     compile 'nl.littlerobots.rxlint:rxlint:1.2'
     compile "frankiesardo:icepick:$icepickVersion"
-    provided "frankiesardo:icepick-processor:$icepickVersion"
+    annotationProcessor "frankiesardo:icepick-processor:$icepickVersion"
     compile "com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
     annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion"
     compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
@@ -162,16 +137,13 @@ dependencies {
         transitive = true
     }
     compile 'com.github.JakeWharton:ViewPagerIndicator:2.4.1@aar'
-    compile 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile 'com.jakewharton:butterknife:8.6.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
     compile 'com.jakewharton.timber:timber:4.5.1'
     compile 'com.github.matrixxun:MaterialBadgeTextView:c5a27e8243'
     compile 'com.github.chrisbanes:PhotoView:2.0.0'
-    provided 'io.reactivex:rxjava:1.3.0'
-    provided "com.github.akarnokd:rxjava2-interop:0.10.2"
-    provided 'com.hadisatrio:Optional:v1.0.1'
     testCompile 'junit:junit:4.12'
-    testCompile "org.mockito:mockito-core:2.7.19"
+    testCompile "org.mockito:mockito-core:2.8.9"
     testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
 }

build.gradle

 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 apply from: rootProject.file('dependencies.gradle')
 
+ext {
+    compileSdkVersion = 26
+    targetSdkVersion = 26
+    buildToolsVersion = "26.0.2"
+}
+
+buildscript {
+    repositories {
+        google()
+        jcenter()
+        maven { url 'https://maven.fabric.io/public' }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.51"
+        classpath 'io.realm:realm-gradle-plugin:3.0.0'
+        classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
+        classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
+        classpath 'io.fabric.tools:gradle:1.+'
+    }
+
+    // Exclude the version that the android plugin depends on.
+    configurations.classpath.exclude group: 'com.android.tools.external.lombok'
+}
+
 allprojects {
     repositories {
+        google()
         jcenter()
-        mavenCentral()
         maven { url 'https://github.com/lijingle1/stetho-realm/raw/master/maven-repo' }
         maven { url 'http://dl.bintray.com/amulyakhare/maven' } //for TextDrawable.
         maven { url "https://clojars.org/repo/" } //for icepick.
         maven { url 'https://jitpack.io' } //for widget-fontawesome.
-        maven { url "https://maven.google.com" } // for Support Library.
     }
 }
 
 // This block encapsulates custom properties and makes them available to all modules in the project.
 // You can also create properties to specify versions for dependencies.
 // Having consistent versions between modules can avoid conflicts with behavior.
-ext {
-    compileSdkVersion = 26
-    targetSdkVersion = 26
-    buildToolsVersion = "26.0.0"
-
-}
 
 task clean(type: Delete) {
     delete rootProject.buildDir

circle.yml

@@ -26,10 +26,10 @@ dependencies:
     - echo y | android update sdk --no-ui --all --filter android-26
     - echo y | android update sdk --no-ui --all --filter extra-android-m2repository,extra-android-support
     - echo y | android update sdk --no-ui --all --filter extra-google-m2repository,extra-google-google_play_services
-    - echo y | android update sdk --no-ui --all --filter build-tools-26.0.0
+    - echo y | android update sdk --no-ui --all --filter build-tools-26.0.2
   cache_directories:
     - /usr/local/android-sdk-linux/tools
-    - /usr/local/android-sdk-linux/build-tools/26.0.0
+    - /usr/local/android-sdk-linux/build-tools/26.0.2
 
 test:
   override:

dependencies.gradle

@@ -2,9 +2,10 @@ ext {
     preDexLibs = "true" != System.getenv("CI")
     supportLibraryVersion = "25.4.0"
     constraintLayoutVersion = "1.0.2"
-    kotlinVersion = "1.1.4-2"
+    kotlinVersion = "1.1.51"
     okHttpVersion = "3.9.0"
     rxbindingVersion = '2.0.0'
+
     supportDependencies = [
             designSupportLibrary: "com.android.support:design:${supportLibraryVersion}",
             annotation          : "com.android.support:support-annotations:${supportLibraryVersion}",
@@ -25,6 +26,7 @@ ext {
             rxBindingAppcompact: "com.jakewharton.rxbinding2:rxbinding-appcompat-v7:${rxbindingVersion}",
     ]
 }
+
 subprojects {
     project.plugins.whenPluginAdded { plugin ->
         if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {

gradle/wrapper/gradle-wrapper.properties

-#Mon Dec 28 10:00:20 PST 2015
+#Tue Nov 07 03:05:05 BRST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

log-wrapper/build.gradle

 apply plugin: 'com.android.library'
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-    }
-}
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion

persistence-realm/build.gradle

@@ -2,21 +2,6 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'realm-android'
 apply plugin: 'com.jakewharton.hugo'
-apply plugin: 'me.tatarka.retrolambda'
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
-        classpath 'io.realm:realm-gradle-plugin:2.3.2'
-        classpath 'me.tatarka:gradle-retrolambda:3.5.0'
-        classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
-        classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
-    }
-}
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion

rocket-chat-android-widgets/build.gradle

@@ -2,16 +2,6 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
-    }
-}
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -21,7 +11,6 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1"
-
         vectorDrawables.useSupportLibrary = true
     }
 

rocket-chat-core/build.gradle

-plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.1.4-2"
-}
-
+apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'idea'
 apply plugin: 'java'
+
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile extraDependencies.rxJava
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
-
     compile 'com.google.code.findbugs:jsr305:3.0.1'
-
-
-
     compile 'com.hadisatrio:Optional:v1.0.1'
-
     compileOnly 'com.google.auto.value:auto-value:1.3'
     kapt 'com.google.auto.value:auto-value:1.3'
     kapt 'com.gabrielittner.auto.value:auto-value-with:1.0.0'
-
     testCompile 'junit:junit:4.12'
     testCompile "org.mockito:mockito-inline:2.8.9"
 }