Merge branch 'main' into develop/jellyseerr

This commit is contained in:
Damontecres 2025-12-27 17:13:20 -05:00
commit 8f02dab6ed
No known key found for this signature in database
38 changed files with 1964 additions and 646 deletions

View file

@ -59,6 +59,7 @@ android {
debug {
isMinifyEnabled = false
isDebuggable = true
applicationIdSuffix = ".debug"
}
}
compileOptions {
@ -230,6 +231,9 @@ dependencies {
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.datastore)
implementation(libs.protobuf.kotlin.lite)
implementation(libs.androidx.tvprovider)
implementation(libs.androidx.work.runtime.ktx)
implementation(libs.androidx.hilt.work)
implementation(libs.androidx.media3.exoplayer)
implementation(libs.androidx.media3.datasource.okhttp)
@ -266,6 +270,7 @@ dependencies {
implementation(libs.androidx.palette.ktx)
ksp(libs.androidx.room.compiler)
ksp(libs.hilt.android.compiler)
ksp(libs.androidx.hilt.compiler)
implementation(libs.timber)
implementation(libs.slf4j2.timber)
@ -291,5 +296,6 @@ dependencies {
implementation(files("libs/lib-decoder-ffmpeg-release.aar"))
}
// implementation(project(":seerr-api"))
testImplementation(libs.mockk.android)
testImplementation(libs.mockk.agent)
}