Merge branch 'main' into fea/libass-android-support

This commit is contained in:
Damontecres 2026-03-29 10:36:27 -04:00
commit 20fed46382
No known key found for this signature in database
93 changed files with 8674 additions and 726 deletions

View file

@ -12,7 +12,7 @@ kotlin = "2.3.20"
ksp = "2.3.6"
coreKtx = "1.18.0"
appcompat = "1.7.1"
composeBom = "2026.03.00"
composeBom = "2026.03.01"
mockk = "1.14.9"
robolectric = "4.16.1"
multiplatformMarkdownRenderer = "0.39.2"
@ -33,17 +33,17 @@ material3AdaptiveNav3 = "1.0.0-alpha03"
protobuf = "0.9.6"
datastore = "1.2.1"
kotlinx-serialization = "1.10.0"
protobuf-javalite = "4.34.0"
protobuf-javalite = "4.34.1"
hilt = "2.59.2"
room = "2.8.4"
preferenceKtx = "1.2.1"
tvprovider = "1.1.0"
workRuntimeKtx = "2.11.1"
workRuntimeKtx = "2.11.2"
paletteKtx = "1.0.0"
assMedia = "0.4.0"
kotlinxCoroutinesTest = "1.10.2"
coreTesting = "2.2.0"
openapi-generator = "7.20.0"
openapi-generator = "7.21.0"
runner = "1.7.0"
[libraries]
@ -73,6 +73,7 @@ androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecyc
androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycleRuntimeKtx" }
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
androidx-datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" }
androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
androidx-tvprovider = { module = "androidx.tvprovider:tvprovider", version.ref = "tvprovider" }
androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }