From 5056615eb0b863bba70d6de3297486a4608e781f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 12:33:40 +0200
Subject: [PATCH] Upgrade kotlin version from `1.3.72` to `1.4.10` and kotlin
 coroutines version from `1.3.8` to `1.3.9`

---
 CHANGES.md                      | 1 +
 build.gradle                    | 4 +++-
 matrix-sdk-android/build.gradle | 9 ++++-----
 vector/build.gradle             | 5 ++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5b3c34d9a0..b02e5b82ff 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,6 +30,7 @@ SDK API changes ⚠️:
 Build 🧱:
  - Use Update Gradle Wrapper Action
  - Updates Gradle Wrapper from 5.6.4 to 6.6.1. (#2193)
+ - Upgrade kotlin version from `1.3.72` to `1.4.10` and kotlin coroutines version from `1.3.8` to `1.3.9`
 
 Other changes:
  - Added registration/verification automated UI tests
diff --git a/build.gradle b/build.gradle
index f06d1859b5..fdb42f8f43 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    // Ref: https://kotlinlang.org/releases.html
+    ext.kotlin_version = '1.4.10'
+    ext.kotlin_coroutines_version = "1.3.9"
     repositories {
         google()
         jcenter()
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 2c20137647..a8aea28754 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -112,15 +112,14 @@ dependencies {
     def moshi_version = '1.8.0'
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
-    def coroutines_version = "1.3.8"
     def markwon_version = '3.1.0'
     def daggerVersion = '2.25.4'
     def work_version = '2.4.0'
     def retrofit_version = '2.6.2'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.core:core-ktx:1.3.1"
@@ -191,7 +190,7 @@ dependencies {
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
     testImplementation 'io.mockk:mockk:1.9.2.kotlin12'
     testImplementation 'org.amshove.kluent:kluent-android:1.44'
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     // Plant Timber tree for test
     testImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
 
@@ -205,7 +204,7 @@ dependencies {
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
     androidTestImplementation 'io.mockk:mockk-android:1.9.2.kotlin12'
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
-    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     // Plant Timber tree for test
     androidTestImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
 
diff --git a/vector/build.gradle b/vector/build.gradle
index 87c8696b02..3acfd99f87 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -283,7 +283,6 @@ dependencies {
     def epoxy_version = '3.11.0'
     def fragment_version = '1.2.5'
     def arrow_version = "0.8.2"
-    def coroutines_version = "1.3.8"
     def markwon_version = '4.1.2'
     def big_image_viewer_version = '1.6.2'
     def glide_version = '4.11.0'
@@ -307,8 +306,8 @@ dependencies {
     implementation 'com.android.support:multidex:1.0.3'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
     implementation "androidx.recyclerview:recyclerview:1.2.0-alpha05"
     implementation 'androidx.appcompat:appcompat:1.2.0'