Update gradle files with new gradle plugin syntax and add Evernote android-job dependency

android-ddp/build.gradle

@@ -21,9 +21,9 @@ android {
     }
 }
 dependencies {
-    compile project(':log-wrapper')
-    compile extraDependencies.okHTTP
-    compile extraDependencies.rxJava
-    compile extraDependencies.boltTask
-    compile supportDependencies.annotation
+    api project(':log-wrapper')
+    implementation extraDependencies.okHTTP
+    implementation extraDependencies.rxJava
+    implementation extraDependencies.boltTask
+    implementation supportDependencies.annotation
 }
\ No newline at end of file

app/build.gradle

@@ -109,43 +109,44 @@ ext {
 }
 
 dependencies {
-    compile project(':android-ddp')
-    compile project(':rocket-chat-android-widgets')
-    compile project(':persistence-realm')
-    compile extraDependencies.okHTTP
-    compile extraDependencies.rxJava
-    compile extraDependencies.boltTask
-    compile supportDependencies.multidex
-    compile supportDependencies.designSupportLibrary
-    compile supportDependencies.annotation
-    compile rxbindingDependencies.rxBinding
-    compile rxbindingDependencies.rxBindingSupport
-    compile rxbindingDependencies.rxBindingAppcompact
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
-    compile "com.google.firebase:firebase-core:$playLibVersion"
-    compile "com.google.firebase:firebase-crash:$playLibVersion"
-    compile "com.google.android.gms:play-services-gcm:$playLibVersion"
-    compile "com.trello.rxlifecycle2:rxlifecycle:$rxlifecycleVersion"
-    compile "com.trello.rxlifecycle2:rxlifecycle-android:$rxlifecycleVersion"
-    compile "com.trello.rxlifecycle2:rxlifecycle-components:$rxlifecycleVersion"
-    compile 'nl.littlerobots.rxlint:rxlint:1.2'
-    compile "frankiesardo:icepick:$icepickVersion"
+    api project(':android-ddp')
+    api project(':rocket-chat-android-widgets')
+    api project(':persistence-realm')
+    implementation extraDependencies.okHTTP
+    implementation extraDependencies.rxJava
+    implementation extraDependencies.boltTask
+    implementation supportDependencies.multidex
+    implementation supportDependencies.designSupportLibrary
+    implementation supportDependencies.annotation
+    implementation rxbindingDependencies.rxBinding
+    implementation rxbindingDependencies.rxBindingSupport
+    implementation rxbindingDependencies.rxBindingAppcompact
+    api "org.jetbrains.kotlin:kotlin-stdlib-jre8:$rootProject.ext.kotlinVersion"
+    implementation "com.google.firebase:firebase-core:$playLibVersion"
+    implementation "com.google.firebase:firebase-crash:$playLibVersion"
+    implementation "com.google.android.gms:play-services-gcm:$playLibVersion"
+    implementation "com.trello.rxlifecycle2:rxlifecycle:$rxlifecycleVersion"
+    implementation "com.trello.rxlifecycle2:rxlifecycle-android:$rxlifecycleVersion"
+    implementation "com.trello.rxlifecycle2:rxlifecycle-components:$rxlifecycleVersion"
+    implementation 'nl.littlerobots.rxlint:rxlint:1.2'
+    implementation "frankiesardo:icepick:$icepickVersion"
     annotationProcessor "frankiesardo:icepick-processor:$icepickVersion"
-    compile "com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
+    implementation "com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
     annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion"
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
+    implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
         transitive = true;
     }
-    debugCompile "com.facebook.stetho:stetho:$stethoVersion"
+    implementation extraDependencies.androidJob
+    debugImplementation "com.facebook.stetho:stetho:$stethoVersion"
     debugCompile "com.facebook.stetho:stetho-okhttp3:$stethoOkhttp3Version"
     debugCompile "com.uphyca:stetho_realm:$stethoRealmVersion"
     debugCompile "com.tspoon.traceur:traceur:1.0.1"
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.3'
-    testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
-    testCompile "org.jetbrains.kotlin:kotlin-reflect:$rootProject.ext.kotlinVersion"
-    testCompile "com.nhaarman:mockito-kotlin:1.5.0"
-    testCompile 'org.amshove.kluent:kluent:1.14'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:3.3'
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-reflect:$rootProject.ext.kotlinVersion"
+    testImplementation "com.nhaarman:mockito-kotlin:1.5.0"
+    testImplementation 'org.amshove.kluent:kluent:1.14'
 }
 apply plugin: 'com.google.gms.google-services'

build.gradle

@@ -16,10 +16,10 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.60"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.0"
         classpath 'io.realm:realm-gradle-plugin:4.2.0'
         classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
-        classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'com.google.gms:google-services:3.1.0'
         classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
         classpath 'io.fabric.tools:gradle:1.+'
     }

dependencies.gradle

@@ -2,7 +2,7 @@ ext {
     preDexLibs = "true" != System.getenv("CI")
     supportLibraryVersion = "27.0.1"
     constraintLayoutVersion = "1.0.2"
-    kotlinVersion = "1.1.51"
+    kotlinVersion = "1.2.0"
     okHttpVersion = "3.9.0"
     rxbindingVersion = '2.0.0'
 
@@ -15,14 +15,17 @@ ext {
             multidex            : "com.android.support:multidex:1.0.2",
             customTabs          : "com.android.support:customtabs:${supportLibraryVersion}"
     ]
+
     extraDependencies = [
             okHTTP         : "com.squareup.okhttp3:okhttp:${okHttpVersion}",
             rxJava         : "io.reactivex.rxjava2:rxjava:2.1.0",
             boltTask       : "com.parse.bolts:bolts-tasks:1.4.0",
             rxAndroid      : "io.reactivex.rxjava2:rxandroid:2.0.1",
             textDrawable   : "com.github.rocketchat:textdrawable:1.0.2",
-            optional       : "com.hadisatrio:Optional:v1.0.1"
+            optional       : "com.hadisatrio:Optional:v1.0.1",
+            androidJob     : "com.evernote:android-job:1.2.1"
     ]
+
     rxbindingDependencies = [
             rxBinding          : "com.jakewharton.rxbinding2:rxbinding:${rxbindingVersion}",
             rxBindingSupport   : "com.jakewharton.rxbinding2:rxbinding-support-v4:${rxbindingVersion}",
@@ -38,5 +41,14 @@ subprojects {
             project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
         }
     }
+
+    project.configurations.all {
+        resolutionStrategy.eachDependency { details ->
+            if (details.requested.group == 'com.android.support'
+                    && !details.requested.name.contains('multidex') ) {
+                details.useVersion "${supportLibraryVersion}"
+            }
+        }
+    }
 }
 

persistence-realm/build.gradle

@@ -30,17 +30,17 @@ android {
     }
 }
 dependencies {
-    compile project(':log-wrapper')
-    compile project(':rocket-chat-core')
-    compile extraDependencies.rxJava
-    compile extraDependencies.boltTask
-    compile supportDependencies.annotation
-    compile supportDependencies.designSupportLibrary
-    compile extraDependencies.rxAndroid
-    provided extraDependencies.optional
-    testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
-    testCompile 'org.json:json:20170516'
-    testCompile 'org.skyscreamer:jsonassert:1.5.0'
-    testCompile 'junit:junit:4.12'
+    api project(':log-wrapper')
+    api project(':rocket-chat-core')
+    implementation extraDependencies.rxJava
+    implementation extraDependencies.boltTask
+    implementation supportDependencies.annotation
+    implementation supportDependencies.designSupportLibrary
+    implementation extraDependencies.rxAndroid
+    implementation extraDependencies.optional
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
+    testImplementation 'org.json:json:20170516'
+    testImplementation 'org.skyscreamer:jsonassert:1.5.0'
+    testImplementation 'junit:junit:4.12'
 }

rocket-chat-android-widgets/build.gradle

@@ -31,25 +31,25 @@ ext {
     frescoVersion = '1.4.0'
 }
 dependencies {
-    compile project(':rocket-chat-core')
-    compile extraDependencies.okHTTP
-    compile extraDependencies.textDrawable
-    compile supportDependencies.annotation
-    compile supportDependencies.cardView
-    compile supportDependencies.designSupportLibrary
-    compile supportDependencies.constraintLayout
-    compile supportDependencies.supportV13
-    compile supportDependencies.customTabs
-    compile rxbindingDependencies.rxBinding
-    compile rxbindingDependencies.rxBindingSupport
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
-    compile 'org.nibor.autolink:autolink:0.6.0'
-    compile 'com.github.yusukeiwaki.android-widget:widget-fontawesome:0.0.1'
-    compile "com.facebook.fresco:fresco:$frescoVersion"
-    compile "com.facebook.fresco:imagepipeline-okhttp3:$frescoVersion"
-    compile 'com.caverock:androidsvg:1.2.1'
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
-    testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
-    testCompile 'junit:junit:4.12'
-    testCompile "org.mockito:mockito-core:2.7.19"
+    api project(':rocket-chat-core')
+    api extraDependencies.okHTTP
+    api extraDependencies.textDrawable
+    api supportDependencies.annotation
+    api supportDependencies.cardView
+    api supportDependencies.designSupportLibrary
+    api supportDependencies.constraintLayout
+    api supportDependencies.supportV13
+    api supportDependencies.customTabs
+    api rxbindingDependencies.rxBinding
+    api rxbindingDependencies.rxBindingSupport
+    api "org.jetbrains.kotlin:kotlin-stdlib-jre8:$rootProject.ext.kotlinVersion"
+    implementation 'org.nibor.autolink:autolink:0.6.0'
+    implementation 'com.github.yusukeiwaki.android-widget:widget-fontawesome:0.0.1'
+    api "com.facebook.fresco:fresco:$frescoVersion"
+    api "com.facebook.fresco:imagepipeline-okhttp3:$frescoVersion"
+    implementation 'com.caverock:androidsvg:1.2.1'
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.mockito:mockito-core:2.10.0"
 }

rocket-chat-core/build.gradle

@@ -5,13 +5,13 @@ apply plugin: 'java'
 dependencies {
     compile extraDependencies.rxJava
     compile extraDependencies.optional
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$rootProject.ext.kotlinVersion"
     compile 'com.google.code.findbugs:jsr305:3.0.2'
     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"
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.mockito:mockito-inline:2.8.9"
 }
-sourceCompatibility = "1.7"
-targetCompatibility = "1.7"
\ No newline at end of file
+sourceCompatibility = "1.8"
+targetCompatibility = "1.8"
\ No newline at end of file