Merge branch 'develop' into feature/ci-build-prepare

.travis.yml

@@ -9,7 +9,6 @@ before_script:
  - 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.1
  - ./gradlew dependencies
- - sed -i -e 's/minSdkVersion = 21/minSdkVersion = 17/g' dependencies.gradle
 
 script:
  - ./gradlew checkstyle findbugs pmd

android-ddp/build.gradle

@@ -27,15 +27,15 @@ android {
     versionName "0.0.8"
   }
   buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-    }
     debug {
       defaultConfig {
-        minSdkVersion 21
+        minSdkVersion rootProject.ext.minSdkVersionDebug
       }
     }
+    release {
+      minifyEnabled false
+      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+    }
   }
 }
 

app/build.gradle

@@ -50,16 +50,16 @@ android {
     }
   }
   buildTypes {
+    debug {
+      defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersionDebug
+      }
+    }
     release {
       minifyEnabled false
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
       signingConfig signingConfigs.release
     }
-    debug {
-      defaultConfig {
-        minSdkVersion 21
-      }
-    }
   }
   productFlavors {
     qa {

circle.yml

+#
+# Build configuration for Circle CI
+#
+# See this thread for speeding up and caching directories: https://discuss.circleci.com/t/installing-android-build-tools-23-0-2/924
+#
+
+machine:
+  environment:
+    ANDROID_HOME: /usr/local/android-sdk-linux
+
+dependencies:
+  pre:
+    - echo "sdk.dir="$ANDROID_HOME > local.properties
+
+    - echo $ROCKET_JKS_BASE64 | base64 --decode > Rocket.jks
+
+    - mkdir -p app/src/release/res/values
+    - echo $GOOGLE_SERVICES_BASE64 | base64 --decode > app/src/release/google-services.json
+    - echo $API_KEY_STRINGS_BASE64 | base64 --decode > app/src/release/res/values/api_key_strings.xml
+
+    - 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.1
+  cache_directories:
+    - /usr/local/android-sdk-linux/tools
+    - /usr/local/android-sdk-linux/build-tools/25.0.1
+
+deployment:
+  beta:
+    tag: /v\d+\.\d+\.\d+(?!.)/
+    owner: RocketChat
+    commands:
+      - ./gradlew publishListingProdRelease
+        -Dorg.gradle.project.track=beta
+  alpha:
+    tag: /v\d+\.\d+\.\d+/
+    owner: RocketChat
+    commands:
+      - ./gradlew publishListingQaRelease
+        -Dorg.gradle.pr oject.track=alpha
\ No newline at end of file

dependencies.gradle

@@ -5,6 +5,7 @@ ext {
   retroLambdaPatch = 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
   compileSdkVersion = 25
   buildToolsVersion = '25.0.1'
+  minSdkVersionDebug = 21
   minSdkVersion = 17
 
   supportVersion = '25.0.1'

realm-helpers/build.gradle

@@ -29,15 +29,15 @@ android {
     versionName "1"
   }
   buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-    }
     debug {
       defaultConfig {
-        minSdkVersion 21
+        minSdkVersion rootProject.ext.minSdkVersionDebug
       }
     }
+    release {
+      minifyEnabled false
+      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+    }
   }
 }
 

rocket-chat-android-widgets/build.gradle

@@ -22,15 +22,15 @@ android {
     vectorDrawables.useSupportLibrary = true
   }
   buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-    }
     debug {
       defaultConfig {
-        minSdkVersion 21
+        minSdkVersion rootProject.ext.minSdkVersionDebug
       }
     }
+    release {
+      minifyEnabled false
+      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+    }
   }
 }
 

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/message/InlineHightlighter.java → rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/helper/InlineHightlighter.java

-package chat.rocket.android.widget.message;
+package chat.rocket.android.widget.helper;
 
 import android.content.Context;
 import android.graphics.Color;

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/message/RocketChatMessageLayout.java

@@ -8,6 +8,7 @@ import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import chat.rocket.android.widget.R;
+import chat.rocket.android.widget.helper.InlineHightlighter;
 import chat.rocket.android.widget.helper.Linkify;
 import com.emojione.Emojione;