diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 36b77b2c8..e24b17b07 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,12 +26,12 @@ if (keystoreFileExists) {
 }
 
 android {
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.github.libretube"
         minSdk = 26
-        targetSdk = 35
+        targetSdk = 36
         versionCode = 65
         versionName = "0.30.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/com/github/libretube/api/NewPipeMediaServiceRepository.kt b/app/src/main/java/com/github/libretube/api/NewPipeMediaServiceRepository.kt
index f67486b99..97e302c1b 100644
--- a/app/src/main/java/com/github/libretube/api/NewPipeMediaServiceRepository.kt
+++ b/app/src/main/java/com/github/libretube/api/NewPipeMediaServiceRepository.kt
@@ -31,9 +31,7 @@ import com.github.libretube.ui.dialogs.ShareDialog.Companion.YOUTUBE_FRONTEND_UR
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.withContext
-import kotlinx.datetime.toKotlinInstant
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.encodeToString
 import org.schabi.newpipe.extractor.InfoItem
 import org.schabi.newpipe.extractor.Page
 import org.schabi.newpipe.extractor.channel.ChannelInfo
@@ -54,6 +52,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipe.extractor.stream.ContentAvailability
 import org.schabi.newpipe.extractor.stream.VideoStream
+import kotlin.time.toKotlinInstant
 
 
 private fun VideoStream.toPipedStream() = PipedStream(
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/SearchSuggestionsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/SearchSuggestionsAdapter.kt
index 242615fbf..dd266386f 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/SearchSuggestionsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/SearchSuggestionsAdapter.kt
@@ -11,7 +11,6 @@ import com.github.libretube.R
 import com.github.libretube.db.obj.SearchHistoryItem
 import com.github.libretube.enums.SearchDataType
 import com.github.libretube.obj.SearchDataItem
-import okhttp3.internal.toImmutableList
 import kotlin.collections.plus
 
 class SearchSuggestionsAdapter(
@@ -31,7 +30,7 @@ class SearchSuggestionsAdapter(
     ) {
         if (historyList == null && suggestionList == null) return
 
-        val oldList = currentList.toImmutableList()
+        val oldList = currentList.toList()
         val histories = historyList ?: oldList.filter { it.type == SearchDataType.HISTORY }
         val suggestions = suggestionList ?: oldList.filter { it.type == SearchDataType.SUGGESTION }
         val newList = (histories + suggestions).distinctBy { it.query }
diff --git a/baselineprofile/build.gradle.kts b/baselineprofile/build.gradle.kts
index 1f5501abe..5ea1f6213 100644
--- a/baselineprofile/build.gradle.kts
+++ b/baselineprofile/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 android {
     namespace = "com.github.libretube.baselineprofile"
-    compileSdk = 34
+    compileSdk = 36
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -22,7 +22,7 @@ android {
 
     defaultConfig {
         minSdk = 28
-        targetSdk = 34
+        targetSdk = 36
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5745691f7..bc5400ff7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,36 +1,36 @@
 [versions]
 appcompat = "1.7.1"
-core = "1.13.1"
+core = "1.17.0"
 documentfile = "1.1.0"
 gradle = "9.0.1"
 junit = "4.13.2"
 kotlin = "2.3.10"
 ksp = "2.3.5"
-lifecycle = "2.8.7"
+lifecycle = "2.10.0"
 constraintlayout = "2.2.1"
-loggingInterceptor = "4.12.0"
+loggingInterceptor = "5.3.2"
 material = "1.14.0-alpha09"
 navigation = "2.9.7"
 newpipeextractor = "fc63085"
 preference = "1.2.1"
 extJunit = "1.3.0"
 espresso = "3.7.0"
-workRuntime = "2.10.5"
-retrofit = "2.11.0"
+workRuntime = "2.11.1"
+retrofit = "3.0.0"
 desugaring = "2.1.5"
-coil = "3.0.4"
-room = "2.6.1"
-kotlinxSerialization = "1.6.3"
-kotlinxDatetime = "0.6.2"
+coil = "3.3.0"
+room = "2.8.4"
+kotlinxSerialization = "1.10.0"
+kotlinxDatetime = "0.7.1"
 media = "1.7.1"
-media3 = "1.9.1"
-activity = "1.9.3"
+media3 = "1.9.2"
+activity = "1.12.4"
 fragment = "1.8.9"
 uiautomator = "2.3.0"
 benchmarkMacroJunit4 = "1.4.1"
 baselineprofile = "1.5.0-alpha03"
 profileinstaller = "1.4.1"
-paging = "3.4.0"
+paging = "3.4.1"
 collection = "1.5.0"
 swiperefreshlayout = "1.2.0"
 splashscreen = "1.2.0"