From 2da6fa400c08b4357436bbddb6f3d5b7d777fd79 Mon Sep 17 00:00:00 2001
From: Nicolas Pomepuy <nicolas@videolabs.io>
Date: Tue, 17 Oct 2023 14:13:12 +0200
Subject: [PATCH] Bump kotlin and android plugin versions

---
 .../java/org/videolan/television/util/TVSearchProvider.kt     | 3 ++-
 .../src/org/videolan/vlc/providers/BrowserProvider.kt         | 2 +-
 build.gradle                                                  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/television/src/main/java/org/videolan/television/util/TVSearchProvider.kt b/application/television/src/main/java/org/videolan/television/util/TVSearchProvider.kt
index 9be677743..47d836ba7 100644
--- a/application/television/src/main/java/org/videolan/television/util/TVSearchProvider.kt
+++ b/application/television/src/main/java/org/videolan/television/util/TVSearchProvider.kt
@@ -47,7 +47,7 @@ import org.videolan.vlc.BuildConfig
 import org.videolan.vlc.R
 import org.videolan.vlc.getFileUri
 import org.videolan.vlc.util.ThumbnailsProvider
-import java.util.*
+import java.util.Locale
 
 class TVSearchProvider : ContentProvider() {
     override fun insert(uri: Uri, values: ContentValues?): Uri? =
@@ -101,6 +101,7 @@ class TVSearchProvider : ContentProvider() {
                                         }
                                     }
                                 }
+                        else { }
                     }
                 }
 
diff --git a/application/vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt b/application/vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
index d79139a91..712da60f1 100644
--- a/application/vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
+++ b/application/vlc-android/src/org/videolan/vlc/providers/BrowserProvider.kt
@@ -185,7 +185,7 @@ abstract class BrowserProvider(val context: Context, val dataset: LiveDataset<Me
      * @param files the files to sort
      */
     fun sort(files: MutableList<MediaLibraryItem>) {
-        getComparator(if (isComparatorAboutFilename())  files.determineMaxNbOfDigits() else 0)?.let { files.apply { this.sortWith(it) } } ?: if (desc) files.apply { reverse() }
+        getComparator(if (isComparatorAboutFilename())  files.determineMaxNbOfDigits() else 0)?.let { files.apply { this.sortWith(it) } } ?: if (desc) files.apply { reverse() } else { }
     }
 
     suspend fun browseUrl(url: String): List<MediaLibraryItem> {
diff --git a/build.gradle b/build.gradle
index 223595687..dbf2138d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.android_plugin_version = '8.1.0'
-    ext.kotlin_version = '1.7.10'
+    ext.android_plugin_version = '8.1.2'
+    ext.kotlin_version = '1.9.0'
     ext.kotlinx_version = '1.6.0'
     repositories {
         flatDir dirs: "gradle/plugins"