From 42bc4d2445d2a5ee8f06a093ba8e11cc7dda992c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 2 Dec 2020 12:08:29 +0100
Subject: [PATCH] Upgrade some dependencies and Kotlin version

---
 CHANGES.md                      | 2 +-
 build.gradle                    | 6 +++---
 matrix-sdk-android/build.gradle | 2 +-
 multipicker/build.gradle        | 2 +-
 vector/build.gradle             | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f6f63db534..9bcd0f2eea 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,7 +20,7 @@ SDK API changes ⚠️:
  -
 
 Build 🧱:
- -
+ - Upgrade some dependencies and Kotlin version
 
 Test:
  -
diff --git a/build.gradle b/build.gradle
index 0c4b35b060..6dd61a720c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,8 +2,8 @@
 
 buildscript {
     // Ref: https://kotlinlang.org/releases.html
-    ext.kotlin_version = '1.4.10'
-    ext.kotlin_coroutines_version = "1.3.9"
+    ext.kotlin_version = '1.4.20'
+    ext.kotlin_coroutines_version = "1.4.1"
     repositories {
         google()
         jcenter()
@@ -12,7 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'com.google.gms:google-services:4.3.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 29c709844a..1923ab2606 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -146,7 +146,7 @@ dependencies {
     implementation "ru.noties.markwon:core:$markwon_version"
 
     // Image
-    implementation 'androidx.exifinterface:exifinterface:1.3.0'
+    implementation 'androidx.exifinterface:exifinterface:1.3.1'
 
     // Database
     implementation 'com.github.Zhuinden:realm-monarchy:0.7.1'
diff --git a/multipicker/build.gradle b/multipicker/build.gradle
index b6e500e493..6e22c8207e 100644
--- a/multipicker/build.gradle
+++ b/multipicker/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment:1.3.0-beta01"
-    implementation 'androidx.exifinterface:exifinterface:1.3.0'
+    implementation 'androidx.exifinterface:exifinterface:1.3.1'
 
     // Log
     implementation 'com.jakewharton.timber:timber:4.7.1'
diff --git a/vector/build.gradle b/vector/build.gradle
index 561e1fd824..811189c693 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -317,7 +317,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment:$fragment_version"
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "androidx.sharetarget:sharetarget:1.0.0"
     implementation 'androidx.core:core-ktx:1.3.2'
 
@@ -366,7 +366,7 @@ dependencies {
 
     // UI
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    implementation 'com.google.android.material:material:1.3.0-alpha02'
+    implementation 'com.google.android.material:material:1.3.0-alpha04'
     implementation 'me.gujun.android:span:1.7'
     implementation "io.noties.markwon:core:$markwon_version"
     implementation "io.noties.markwon:html:$markwon_version"
@@ -374,7 +374,7 @@ dependencies {
     implementation 'me.saket:better-link-movement-method:2.2.0'
     implementation 'com.google.android:flexbox:1.1.1'
     implementation "androidx.autofill:autofill:$autofill_version"
-    implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta10'
+    implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
 
     // Custom Tab
     implementation 'androidx.browser:browser:1.2.0'
@@ -418,7 +418,7 @@ dependencies {
     kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.5.0'
 
     // gplay flavor only
-    gplayImplementation('com.google.firebase:firebase-messaging:20.3.0') {
+    gplayImplementation('com.google.firebase:firebase-messaging:21.0.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'