From 751109ac3997fd0deaa5c03483c1dab38a085b67 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Fri, 21 May 2021 17:51:35 +0200
Subject: [PATCH] upgrade kotlin to 1.5.0 (#2162)

* upgrade kotlin to 1.5.0

* don't explicitly set kotlin jvmtarget
---
 app/build.gradle                                              | 3 ---
 .../main/java/com/keylesspalace/tusky/adapter/EmojiAdapter.kt | 2 +-
 .../tusky/components/compose/ComposeViewModel.kt              | 4 ++--
 .../main/java/com/keylesspalace/tusky/db/AccountManager.kt    | 2 +-
 .../java/com/keylesspalace/tusky/util/CustomEmojiHelper.kt    | 2 --
 build.gradle                                                  | 2 +-
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2ee231ff6..5f280a348 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,9 +83,6 @@ android {
             enableSplit = false
         }
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
 }
 
 ext.lifecycleVersion = "2.2.0"
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/EmojiAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/adapter/EmojiAdapter.kt
index 2640caaca..c5656115f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/EmojiAdapter.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/EmojiAdapter.kt
@@ -30,7 +30,7 @@ class EmojiAdapter(
 ) : RecyclerView.Adapter<BindingHolder<ItemEmojiButtonBinding>>() {
 
     private val emojiList : List<Emoji> = emojiList.filter { emoji -> emoji.visibleInPicker == null || emoji.visibleInPicker }
-            .sortedBy { it.shortcode.toLowerCase(Locale.ROOT) }
+            .sortedBy { it.shortcode.lowercase(Locale.ROOT) }
 
     override fun getItemCount() = emojiList.size
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
index f9283ed12..2e38fbe84 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
@@ -351,11 +351,11 @@ class ComposeViewModel @Inject constructor(
             ':' -> {
                 val emojiList = emoji.value ?: return emptyList()
 
-                val incomplete = token.substring(1).toLowerCase(Locale.ROOT)
+                val incomplete = token.substring(1).lowercase(Locale.ROOT)
                 val results = ArrayList<ComposeAutoCompleteAdapter.AutocompleteResult>()
                 val resultsInside = ArrayList<ComposeAutoCompleteAdapter.AutocompleteResult>()
                 for (emoji in emojiList) {
-                    val shortcode = emoji.shortcode.toLowerCase(Locale.ROOT)
+                    val shortcode = emoji.shortcode.lowercase(Locale.ROOT)
                     if (shortcode.startsWith(incomplete)) {
                         results.add(ComposeAutoCompleteAdapter.EmojiResult(emoji))
                     } else if (shortcode.indexOf(incomplete, 1) != -1) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/db/AccountManager.kt b/app/src/main/java/com/keylesspalace/tusky/db/AccountManager.kt
index fc10adb63..52650f77a 100644
--- a/app/src/main/java/com/keylesspalace/tusky/db/AccountManager.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/db/AccountManager.kt
@@ -65,7 +65,7 @@ class AccountManager @Inject constructor(db: AppDatabase) {
 
         val maxAccountId = accounts.maxByOrNull { it.id }?.id ?: 0
         val newAccountId = maxAccountId + 1
-        activeAccount = AccountEntity(id = newAccountId, domain = domain.toLowerCase(Locale.ROOT), accessToken = accessToken, isActive = true)
+        activeAccount = AccountEntity(id = newAccountId, domain = domain.lowercase(Locale.ROOT), accessToken = accessToken, isActive = true)
 
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/CustomEmojiHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/CustomEmojiHelper.kt
index 7521afe40..f63c44b84 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/CustomEmojiHelper.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/CustomEmojiHelper.kt
@@ -31,8 +31,6 @@ import com.keylesspalace.tusky.entity.Emoji
 
 import java.lang.ref.WeakReference
 import java.util.regex.Pattern
-import androidx.preference.PreferenceManager
-import com.keylesspalace.tusky.settings.PrefKeys
 
 /**
  * replaces emoji shortcodes in a text with EmojiSpans
diff --git a/build.gradle b/build.gradle
index 94911834e..c05263c73 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.4.31'
+    ext.kotlin_version = '1.5.0'
     repositories {
         google()
         jcenter()