From 78b1fcb9c6bb3bd40e875faec3daa0f364800164 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Thu, 23 May 2024 21:51:25 +0200
Subject: [PATCH] Upgrade kotlin to v2 (#4461)

---
 .gitignore                                                    | 3 ++-
 .../com/keylesspalace/tusky/util/ViewBindingExtensions.kt     | 2 +-
 gradle/libs.versions.toml                                     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index b40257dd5..67ab69cfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ build
 /captures
 .externalNativeBuild
 app/release
-app-release.apk
\ No newline at end of file
+app-release.apk
+.kotlin
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/ViewBindingExtensions.kt b/app/src/main/java/com/keylesspalace/tusky/util/ViewBindingExtensions.kt
index 4ea3edeab..5cdcd8977 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/ViewBindingExtensions.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/ViewBindingExtensions.kt
@@ -20,7 +20,7 @@ inline fun <T : ViewBinding> AppCompatActivity.viewBinding(
     bindingInflater(layoutInflater)
 }
 
-private class ViewLifecycleLazy<out T : Any>(
+private class ViewLifecycleLazy<T : Any>(
     private val fragment: Fragment,
     private val initializer: (View) -> T
 ) : Lazy<T>, LifecycleEventObserver {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5dd7b1280..a0cc8f82d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -34,7 +34,7 @@ glide = "4.16.0"
 # Deliberate downgrade, https://github.com/tuskyapp/Tusky/issues/3631
 glide-animation-plugin = "2.23.0"
 hilt = "2.51.1"
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 image-cropper = "4.3.2"
 material = "1.12.0"
 material-drawer = "8.4.5"
@@ -56,7 +56,7 @@ xmlwriter = "1.0.4"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
-google-ksp = "com.google.devtools.ksp:1.9.24-1.0.20"
+google-ksp = "com.google.devtools.ksp:2.0.0-1.0.21"
 hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }