From 7d255e8302c3abb44cb8a6a11ab892331a5d0407 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Thu, 4 Jun 2020 20:16:48 +0200
Subject: [PATCH] upgrade gradle, AGP and dependencies (#1818)

* upgrade gradle, AGP and dependencies

* fix new layout related warnings
---
 app/build.gradle                              |  29 +++++++++---------
 app/src/main/res/layout/activity_account.xml  |   2 +-
 app/src/main/res/layout/item_account.xml      |   2 +-
 app/src/main/res/layout/item_conversation.xml |   2 +-
 .../main/res/layout/item_media_preview.xml    |  15 ++++-----
 .../main/res/layout/item_report_status.xml    |   4 +--
 app/src/main/res/layout/item_status.xml       |   2 +-
 .../main/res/layout/item_status_detailed.xml  |   2 +-
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 58695 -> 58694 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 11 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2a4b3568..f7d0b7b7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -112,29 +112,30 @@ project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 
 ext.lifecycleVersion = "2.2.0"
 ext.roomVersion = '2.2.5'
-ext.retrofitVersion = '2.8.1'
-ext.okhttpVersion = '4.4.0'
+ext.retrofitVersion = '2.9.0'
+ext.okhttpVersion = '4.7.2'
 ext.glideVersion = '4.11.0'
-ext.daggerVersion = '2.27'
-ext.materialdrawerVersion = '8.0.1'
+ext.daggerVersion = '2.28'
+ext.materialdrawerVersion = '8.0.3'
 
 // if libraries are changed here, they should also be changed in LicenseActivity
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    implementation "androidx.core:core-ktx:1.2.0"
-    implementation "androidx.appcompat:appcompat:1.2.0-alpha02"
-    implementation "androidx.fragment:fragment-ktx:1.2.2"
+    implementation "androidx.core:core-ktx:1.3.0"
+    implementation "androidx.appcompat:appcompat:1.2.0-rc01"
+    implementation "androidx.fragment:fragment-ktx:1.2.4"
     implementation "androidx.browser:browser:1.2.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation "androidx.exifinterface:exifinterface:1.1.0"
+    implementation "androidx.exifinterface:exifinterface:1.2.0"
     implementation "androidx.cardview:cardview:1.0.0"
-    implementation "androidx.preference:preference:1.1.0"
-    implementation "androidx.sharetarget:sharetarget:1.0.0-rc01"
-    implementation "androidx.emoji:emoji:1.1.0-beta01"
-    implementation "androidx.emoji:emoji-appcompat:1.1.0-beta01"
-    implementation "androidx.emoji:emoji-bundled:1.1.0-beta01"
+    implementation "androidx.preference:preference:1.1.1"
+    implementation "androidx.sharetarget:sharetarget:1.0.0"
+    implementation "androidx.emoji:emoji:1.1.0-rc01"
+    implementation "androidx.emoji:emoji-appcompat:1.1.0-rc01"
+    implementation "androidx.emoji:emoji-bundled:1.1.0-rc01"
+
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycleVersion"
@@ -162,7 +163,7 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion"
 
-    implementation "io.reactivex.rxjava2:rxjava:2.2.16"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
     implementation "io.reactivex.rxjava2:rxkotlin:2.4.0"
 
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index 77f0b760..b92ec392 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -145,12 +145,12 @@
                         android:layout_height="16sp"
                         android:layout_marginStart="4dp"
                         android:contentDescription="@string/description_account_locked"
-                        android:tint="?android:textColorSecondary"
                         android:visibility="gone"
                         app:layout_constraintBottom_toBottomOf="@+id/accountUsernameTextView"
                         app:layout_constraintStart_toEndOf="@+id/accountUsernameTextView"
                         app:layout_constraintTop_toTopOf="@+id/accountUsernameTextView"
                         app:srcCompat="@drawable/ic_reblog_private_24dp"
+                        app:tint="?android:textColorSecondary"
                         tools:visibility="visible" />
                     
                     <TextView
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 45114bb6..a7b3a0ef 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -29,7 +29,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/account_avatar"
         app:layout_constraintEnd_toEndOf="@id/account_avatar"
-        tools:src="@color/accent"
+        tools:src="#000"
         tools:visibility="visible" />
 
     <androidx.emoji.widget.EmojiTextView
diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 38ac4313..8742740e 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -76,7 +76,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/status_avatar"
         app:layout_constraintEnd_toEndOf="@id/status_avatar"
-        tools:src="@color/accent"
+        tools:src="#000"
         tools:visibility="visible" />
 
     <androidx.emoji.widget.EmojiTextView
diff --git a/app/src/main/res/layout/item_media_preview.xml b/app/src/main/res/layout/item_media_preview.xml
index d633cf7e..ab0fe073 100644
--- a/app/src/main/res/layout/item_media_preview.xml
+++ b/app/src/main/res/layout/item_media_preview.xml
@@ -2,7 +2,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-	tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
         <com.keylesspalace.tusky.view.MediaPreviewImageView
             android:id="@+id/status_media_preview_0"
@@ -25,13 +25,11 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="ContentDescription" />
 
-
         <com.keylesspalace.tusky.view.MediaPreviewImageView
             android:id="@+id/status_media_preview_2"
             android:layout_width="0dp"
             android:layout_height="@dimen/status_media_preview_height"
             android:layout_marginTop="4dp"
-            android:background="@drawable/media_preview_outline"
             android:scaleType="centerCrop"
             app:layout_constraintEnd_toStartOf="@+id/status_media_preview_3"
             app:layout_constraintStart_toStartOf="parent"
@@ -44,6 +42,7 @@
             android:layout_height="@dimen/status_media_preview_height"
             android:layout_marginStart="4dp"
             android:layout_marginTop="4dp"
+            android:background="@drawable/media_preview_outline"
             android:scaleType="centerCrop"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/status_media_preview_2"
@@ -105,19 +104,18 @@
             android:alpha="0.7"
             android:contentDescription="@null"
             android:padding="@dimen/status_sensitive_media_button_padding"
-            android:tint="@color/white"
             android:visibility="gone"
             app:layout_constraintLeft_toLeftOf="@+id/status_media_preview_container"
             app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
-            app:srcCompat="@drawable/ic_eye_24dp" />
+            app:srcCompat="@drawable/ic_eye_24dp"
+            app:tint="@color/white" />
 
         <TextView
             android:id="@+id/status_sensitive_media_warning"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:background="@drawable/media_warning_bg"
             android:gravity="center"
-            android:importantForAccessibility="no"
             android:lineSpacingMultiplier="1.2"
             android:orientation="vertical"
             android:paddingLeft="12dp"
@@ -185,5 +183,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/status_media_label_2" />
 
-
 </merge>
diff --git a/app/src/main/res/layout/item_report_status.xml b/app/src/main/res/layout/item_report_status.xml
index 26b158a0..b7ed0555 100644
--- a/app/src/main/res/layout/item_report_status.xml
+++ b/app/src/main/res/layout/item_report_status.xml
@@ -194,12 +194,12 @@
             android:alpha="0.7"
             android:contentDescription="@null"
             android:padding="@dimen/status_sensitive_media_button_padding"
-            android:tint="@color/white"
             android:visibility="gone"
             app:layout_constraintLeft_toLeftOf="@+id/status_media_preview_container"
             app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
             app:srcCompat="@drawable/ic_eye_24dp"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            app:tint="@color/white" />
 
         <TextView
             android:id="@+id/status_sensitive_media_warning"
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index b52151cb..82488ac7 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -52,7 +52,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/status_avatar"
         app:layout_constraintEnd_toEndOf="@id/status_avatar"
-        tools:src="@color/accent"
+        tools:src="#000"
         tools:visibility="visible" />
 
     <androidx.emoji.widget.EmojiTextView
diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index 1ae463d6..832e6133 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -33,7 +33,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/status_avatar"
         app:layout_constraintEnd_toEndOf="@id/status_avatar"
-        tools:src="@color/accent"
+        tools:src="#000"
         tools:visibility="visible" />
 
     <androidx.emoji.widget.EmojiTextView
diff --git a/build.gradle b/build.gradle
index 9d0f08da..d794b292 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f3d88b1c2faf2fc91d853cd5d4242b5547257070..490fda8577df6c95960ba7077c43220e5bb2c0d9 100644
GIT binary patch
delta 6577
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
MViXjGx&OBR0?kH%b^rhX

delta 6547
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
HKP~w$%`S9K

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6254d2d4..186b7155 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists