From c627940a31c55432497a9f14eb2534c3cbbee02b Mon Sep 17 00:00:00 2001
From: Garfie <chiu.garfie@gmail.com>
Date: Thu, 2 Apr 2026 19:54:58 -0500
Subject: [PATCH] Upgrade to Kotlin 2.3.20, CMP 1.11, AGP 9.1, Gradle 9.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Kotlin 2.1.20 → 2.3.20, KSP → 2.3.6
- Compose Multiplatform 1.8.0 → 1.11.0-beta01
- AGP 8.7.3 → 9.1.0, Gradle 8.11.1 → 9.4.1
- Koin 4.1.0 → 4.2.0, Ktor 3.0.3 → 3.4.2
- kotlinx-serialization 1.7.3 → 1.10.0
- kotlinx-datetime 0.6.1 → 0.7.1 (Instant → kotlin.time)
- Room 2.7.1 → 2.8.4, sqlite-bundled 2.5.0 → 2.6.2
- Lifecycle 2.8.7 → 2.9.0, Navigation 2.8.5 → 2.9.2
- SKIE 0.10.10 → 0.10.11, Coil 3.1.0 → 3.3.0
- Kermit 2.0.4 → 2.1.0, DataStore 1.1.1 → 1.2.1
- Paging 3.3.5 → 3.4.2, Media3 1.2.0 → 1.10.0
- Markdown renderer 0.27.0 → 0.39.2
- compileSdk 35 → 36, Compose BOM → 2025.05.00
---
 .../chat/components/MarkdownContent.kt        |  2 -
 .../components/PlatformChatComponents.ios.kt  |  4 +-
 gradle/libs.versions.toml                     | 48 +++++++++----------
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/feature/chat/src/androidMain/kotlin/com/librechat/android/feature/chat/components/MarkdownContent.kt b/feature/chat/src/androidMain/kotlin/com/librechat/android/feature/chat/components/MarkdownContent.kt
index 6f7be13..92a2fec 100644
--- a/feature/chat/src/androidMain/kotlin/com/librechat/android/feature/chat/components/MarkdownContent.kt
+++ b/feature/chat/src/androidMain/kotlin/com/librechat/android/feature/chat/components/MarkdownContent.kt
@@ -289,8 +289,6 @@ private fun MarkdownTextSegment(
 ) {
     val colors = markdownColor(
         text = MaterialTheme.colorScheme.onSurface,
-        codeText = MaterialTheme.colorScheme.onSurface,
-        linkText = MaterialTheme.colorScheme.primary,
         codeBackground = MaterialTheme.colorScheme.surfaceContainerHigh,
         inlineCodeBackground = MaterialTheme.colorScheme.surfaceContainerHigh,
         dividerColor = MaterialTheme.colorScheme.outlineVariant,
diff --git a/feature/chat/src/iosMain/kotlin/com/librechat/android/feature/chat/components/PlatformChatComponents.ios.kt b/feature/chat/src/iosMain/kotlin/com/librechat/android/feature/chat/components/PlatformChatComponents.ios.kt
index 8a05db5..a9bcfba 100644
--- a/feature/chat/src/iosMain/kotlin/com/librechat/android/feature/chat/components/PlatformChatComponents.ios.kt
+++ b/feature/chat/src/iosMain/kotlin/com/librechat/android/feature/chat/components/PlatformChatComponents.ios.kt
@@ -447,8 +447,8 @@ actual fun MarkdownContent(
     val segments = remember(text) { splitTableSegments(text) }
 
     val colors = markdownColor(
-        text = MaterialTheme.colorScheme.onSurface, codeText = MaterialTheme.colorScheme.onSurface,
-        linkText = MaterialTheme.colorScheme.primary, codeBackground = MaterialTheme.colorScheme.surfaceContainerHigh,
+        text = MaterialTheme.colorScheme.onSurface,
+        codeBackground = MaterialTheme.colorScheme.surfaceContainerHigh,
         inlineCodeBackground = MaterialTheme.colorScheme.surfaceContainerHigh, dividerColor = MaterialTheme.colorScheme.outlineVariant,
     )
     val bl = MaterialTheme.typography.bodyLarge
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 139aea4..132e63a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,54 +1,54 @@
 [versions]
 # Core Android
-agp = "8.7.3"
-kotlin = "2.1.20"
-ksp = "2.1.20-1.0.31"
-compose-bom = "2024.12.01"
-compose-multiplatform = "1.8.0"
+agp = "9.1.0"
+kotlin = "2.3.20"
+ksp = "2.3.6"
+compose-bom = "2025.05.00"
+compose-multiplatform = "1.11.0-beta01"
 material3 = "1.3.1"
-activity-compose = "1.9.3"
-navigation-compose = "2.8.5"
-lifecycle = "2.8.7"
-lifecycle-kmp = "2.8.7"
-navigation-kmp = "2.8.5"
+activity-compose = "1.10.1"
+navigation-compose = "2.9.2"
+lifecycle = "2.9.0"
+lifecycle-kmp = "2.9.0"
+navigation-kmp = "2.9.2"
 
 # DI
-koin = "4.1.1"
+koin = "4.2.0"
 
 # Network
-ktor = "3.1.3"
-kotlinx-serialization = "1.7.3"
-kotlinx-datetime = "0.6.1"
+ktor = "3.4.2"
+kotlinx-serialization = "1.10.0"
+kotlinx-datetime = "0.7.1"
 
 # Local Data
-room = "2.7.1"  # Upgraded for KMP support (was 2.6.1)
-sqlite = "2.5.0"  # Must match Kotlin 2.1.x ABI; 2.6.x requires Kotlin 2.2.0
-datastore = "1.1.1"
+room = "2.8.4"
+sqlite = "2.6.2"
+datastore = "1.2.1"
 security-crypto = "1.1.0"
 
 # Async
 coroutines = "1.10.2"
 
 # Paging
-paging = "3.3.5"
+paging = "3.4.2"
 
 # Browser
-browser = "1.8.0"
+browser = "1.10.0"
 
 # Markdown
-markdown-renderer = "0.27.0"
+markdown-renderer = "0.39.2"
 
 # Media
-media3 = "1.2.0"
+media3 = "1.10.0"
 
 # Image Loading
-coil3 = "3.1.0"
+coil3 = "3.3.0"
 
 # Logging
-kermit = "2.0.6"
+kermit = "2.1.0"
 
 # KMP / iOS
-skie = "0.10.10"
+skie = "0.10.11"
 
 # Testing
 junit = "4.13.2"