Merge branch 'develop' into rv-sync

.travis.yml

@@ -2,14 +2,52 @@
 
 language: android
 jdk: oraclejdk8
+sudo: required
+
+android:
+  components: # Cookbooks version: https://github.com/travis-ci/travis-cookbooks/tree/9c6cd11
+    - tools # Update preinstalled tools from revision 24.0.2 to 24.4.1
+    - build-tools-25.0.3 # Match build-tools version used in build.gradle
+    - platform-tools # Update platform-tools to revision 25.0.3+
+    - tools # Update tools from revision 24.4.1 to 25.2.5
+
+env:
+  global:
+    - API=26 # Android API level 26 by default
+    - TAG=google_apis # Google APIs by default, alternatively use default
+    - ABI=armeabi-v7a # ARM ABI v7a by default
+    - QEMU_AUDIO_DRV=none # Disable emulator audio to avoid warning
+    - ANDROID_HOME=/usr/local/android-sdk # Depends on the cookbooks version used in the VM
+    - TOOLS=${ANDROID_HOME}/tools # PATH order matters, exists more than one emulator script
+    - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
+    - ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default)
+
+install:
+  # List and delete unnecessary components to free space
+  - sdkmanager --list || true
+  - sdkmanager --uninstall "system-images;android-15;default;armeabi-v7a"
+
+  # Update sdk tools to latest version and install/update components
+  - echo yes | sdkmanager "tools"
+  - echo yes | sdkmanager "platforms;android-26" # Latest platform required by SDK tools
+  - echo yes | sdkmanager "platforms;android-${API}" # Android platform required by emulator
+  - echo yes | sdkmanager "extras;android;m2repository"
+  - echo yes | sdkmanager "extras;google;m2repository"
+  - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
+  - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
+# - echo yes | sdkmanager "$EMULATOR" # Install emulator system image
+#   Create and start emulator
+# - echo no | avdmanager create avd -n acib -k "$EMULATOR" -f --abi "$ABI" --tag "$TAG"
+# - emulator -avd acib -engine classic -no-window -verbose -qemu -m 512 &
+
 before_script:
- - echo y | android update sdk --no-ui --all --filter tools,platform-tools
- - echo y | android update sdk --no-ui --all --filter android-25
- - 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-25.0.3
- - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
- - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
+# - echo y | android update sdk --no-ui --all --filter tools,platform-tools
+# - echo y | android update sdk --no-ui --all --filter android-25
+# - 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-25.0.3
+# - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
+# - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
  - ./gradlew dependencies
 
 script:

android-ddp/build.gradle

@@ -13,8 +13,8 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -22,7 +22,7 @@ android {
     }
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "0.0.8"
     }
@@ -34,18 +34,14 @@ android {
     }
 }
 
-ext {
-    supportVersion = '25.3.1'
-}
-
 dependencies {
     compile project(':log-wrapper')
 
-    compile "com.android.support:support-annotations:$supportVersion"
+    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
 
     compile 'com.squareup.okhttp3:okhttp:3.8.0'
 
     compile 'io.reactivex.rxjava2:rxjava:2.1.0'
 
     compile 'com.parse.bolts:bolts-tasks:1.4.0'
-}
+}
\ No newline at end of file

app/build.gradle

@@ -27,12 +27,12 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
         applicationId "chat.rocket.android"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 25
         versionName "1.0.15"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -75,7 +75,6 @@ play {
 }
 
 ext {
-    supportVersion = '25.3.1'
     playLibVersion = '10.2.6'
     stethoVersion = '1.4.2'
     rxbindingVersion = '2.0.0'
@@ -91,8 +90,11 @@ dependencies {
     compile project(':rocket-chat-android-widgets')
     compile project(':persistence-realm')
 
-    compile "com.android.support:appcompat-v7:$supportVersion"
-    compile "com.android.support:design:$supportVersion"
+    compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
+    compile "com.android.support:design:$rootProject.ext.supportLibraryVersion"
+
+    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
 
     compile 'com.android.support:multidex:1.0.1'
 
@@ -124,9 +126,6 @@ dependencies {
 
     compile "com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
     annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion"
-
-    compile "com.android.support:support-annotations:$supportVersion"
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
 
 apply plugin: 'com.google.gms.google-services'

build.gradle

@@ -9,9 +9,20 @@ allprojects {
         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"
+    supportLibraryVersion = "25.4.0"
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
\ No newline at end of file

log-wrapper/build.gradle

@@ -10,12 +10,12 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1"
     }

persistence-realm/build.gradle

@@ -17,8 +17,8 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -26,7 +26,7 @@ android {
     }
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1"
     }
@@ -38,17 +38,13 @@ android {
     }
 }
 
-ext {
-    supportVersion = '25.3.1'
-}
-
 dependencies {
     compile project(':log-wrapper')
     compile project(':rocket-chat-core')
 
-    compile "com.android.support:support-annotations:$supportVersion"
-    compile "com.android.support:appcompat-v7:$supportVersion"
-    compile "com.android.support:design:$supportVersion"
+    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
+    compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
+    compile "com.android.support:design:$rootProject.ext.supportLibraryVersion"
 
     compile 'io.reactivex.rxjava2:rxjava:2.1.0'
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'

rocket-chat-android-widgets/build.gradle

@@ -10,12 +10,12 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1"
 
@@ -30,7 +30,6 @@ android {
 }
 
 ext {
-    supportVersion = '25.3.1'
     frescoVersion = '1.3.0'
     rxbindingVersion = '2.0.0'
 }
@@ -38,12 +37,12 @@ ext {
 dependencies {
     compile project(':rocket-chat-core')
 
-    compile "com.android.support:support-annotations:$supportVersion"
-    compile "com.android.support:appcompat-v7:$supportVersion"
-    compile "com.android.support:recyclerview-v7:$supportVersion"
-    compile "com.android.support:cardview-v7:$supportVersion"
-    compile "com.android.support:support-v13:$supportVersion"
-    compile "com.android.support:design:$supportVersion"
+    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
+    compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
+    compile "com.android.support:recyclerview-v7:$rootProject.ext.supportLibraryVersion"
+    compile "com.android.support:cardview-v7:$rootProject.ext.supportLibraryVersion"
+    compile "com.android.support:support-v13:$rootProject.ext.supportLibraryVersion"
+    compile "com.android.support:design:$rootProject.ext.supportLibraryVersion"
 
     compile 'org.nibor.autolink:autolink:0.6.0'