Merge pull request #25 from RocketChat/develop

merge

app/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 'android-P'
+    compileSdkVersion versions.compileSdk
     buildToolsVersion versions.buildTools
 
     defaultConfig {

app/src/main/res/layout/fragment_chat_room.xml

@@ -64,7 +64,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/text_chat_title" />
 
-    <android.support.constraint.Group
+    <androidx.constraintlayout.widget.Group
         android:id="@+id/empty_chat_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

app/src/main/res/layout/fragment_files.xml

@@ -64,7 +64,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_no_file" />
 
-    <android.support.constraint.Group
+    <androidx.constraintlayout.widget.Group
         android:id="@+id/group_no_file"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

app/src/main/res/layout/fragment_member_bottom_sheet.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="16dp"
-    app:layout_behavior="android.support.design.widget.BottomSheetBehavior">
+    app:layout_behavior="	com.google.android.material.bottomsheet.BottomSheetBehavior">
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/image_bottom_sheet_avatar"

app/src/main/res/layout/item_generic_attachment.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -71,4 +71,4 @@
         app:layout_constraintStart_toEndOf="@+id/image_container"
         tools:text="Ma 22, 2018 6:42 PM" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/item_message_reply.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/message_container"
     android:layout_width="match_parent"
@@ -34,4 +34,4 @@
         app:layout_constraintStart_toStartOf="@+id/button_message_reply"
         app:layout_constraintTop_toBottomOf="@+id/button_message_reply" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

dependencies.gradle

@@ -2,7 +2,7 @@ ext {
     versions = [
             java                  : JavaVersion.VERSION_1_8,
             compileSdk            : 28,
-            targetSdk             : 27,
+            targetSdk             : 28,
             buildTools            : '28.0.0-rc2',
             kotlin                : '1.2.41',
             coroutine             : '0.22.5',

player/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 'android-P'
+    compileSdkVersion versions.compileSdk
     buildToolsVersion versions.buildTools
 
     defaultConfig {