Merge branch 'update-kotlin-version'

3 files changed, 5 insertions, 5 deletions

diff --git a/android/build.gradle b/android/build.gradle
index 7b6b229f96..4ab4bbcc84 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -83,8 +83,8 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.21'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.10'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
     implementation 'joda-time:joda-time:2.10.2'
 }
 
@@ -101,7 +101,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.0'
         classpath 'com.github.triplet.gradle:play-publisher:2.7.5'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10'
     }
 }
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
index 36fea18303..28851a8641 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
@@ -135,7 +135,7 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clipData = ClipData.newPlainText(clipboardLabel, accountToken)
 
-        clipboard.primaryClip = clipData
+        clipboard.setPrimaryClip(clipData)
 
         Toast.makeText(context, toastMessage, Toast.LENGTH_SHORT).show()
     }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt
index 33530283cb..348c8a2530 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt
@@ -58,7 +58,7 @@ class CopyableInformationView : InformationView {
         val clipData = ClipData.newPlainText(clipboardLabel, information)
         val toastMessage = copiedToast ?: context.getString(R.string.copied_to_clipboard)
 
-        clipboard.primaryClip = clipData
+        clipboard.setPrimaryClip(clipData)
 
         Toast.makeText(context, toastMessage, Toast.LENGTH_SHORT).show()
     }