Merge pull request #1742 from RocketChat/beta

[RELEASE] Merge Beta to Master - Don't merge yet
RocketChat · Oct 19, 2018 · ea6c808 · ea6c808
2 parents 20ce810 + 65de72f
commit ea6c808
Show file tree

Hide file tree

Showing 230 changed files with 11,464 additions and 4,281 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2043
-        versionName "2.6.1"
+        versionCode 2048
+        versionName "3.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
@@ -93,6 +93,7 @@ dependencies {
     implementation project(':draw')
     implementation project(':util')
     implementation project(':core')
+    implementation project(':suggestions')
 
     implementation libraries.kotlin
     implementation libraries.coroutines
@@ -151,6 +152,8 @@ dependencies {
 
     implementation libraries.livedataKtx
 
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+
     // Proprietary libraries
     playImplementation libraries.fcm
     playImplementation libraries.firebaseAnalytics