Merge branch 'main' into dependabot/gradle/com.squareup.okio-okio-3.10.2

SRGSSR · Jan 20, 2025 · 1d07d74 · 1d07d74
2 parents 1715abb + a3ee6d9
commit 1d07d74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...gic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/PillarboxAndroidApplicationPlugin.kt b/...gic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/PillarboxAndroidApplicationPlugin.kt
@@ -36,7 +36,7 @@ class PillarboxAndroidApplicationPlugin : Plugin<Project> {
 
             defaultConfig {
                 applicationId = namespace
-                resourceConfigurations += "en"
+                androidResources.localeFilters += "en"
                 targetSdk = AppConfig.targetSdk
                 versionCode = VersionConfig().versionCode()
                 versionName = VersionConfig().versionName()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-android-gradle-plugin = "8.7.3"
+android-gradle-plugin = "8.8.0"
 androidx-activity = "1.9.3"
 androidx-annotation = "1.9.1"
 androidx-compose = "2024.12.01"
@@ -27,7 +27,7 @@ kotlin = "2.1.0"
 kotlinx-coroutines = "1.10.1"
 kotlinx-datetime = "0.6.1"
 kotlinx-kover = "0.9.1"
-kotlinx-serialization = "1.7.3"
+kotlinx-serialization = "1.8.0"
 mockk = "1.13.16"
 okhttp = "4.12.0"
 okio = "3.10.2"

diff --git a/pillarbox-player/src/androidTest/java/ch/srgssr/pillarbox/player/utils/ContentUrls.kt b/pillarbox-player/src/androidTest/java/ch/srgssr/pillarbox/player/utils/ContentUrls.kt
@@ -4,6 +4,7 @@
  */
 package ch.srgssr.pillarbox.player.utils
 
+@Suppress("MaxLineLength")
 object ContentUrls {
     const val VOD_HLS = "https://rts-vod-amd.akamaized.net/ww/14970442/da2b38fb-ca9f-3c76-80c6-e6fa7f3c2699/master.m3u8"
 
@@ -13,7 +14,7 @@ object ContentUrls {
     const val VOD_DASH_H265 = "https://storage.googleapis.com/wvmedia/clear/hevc/tears/tears.mpd"
     const val LIVE_HLS = "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8?dw=0"
     const val LIVE_DVR_HLS = "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8"
-    const val AOD_MP3 = "https://srfaudio-a.akamaihd.net/delivery/world/af671f12-6f17-415a-9dd8-b8aee24cce8b.mp3"
+    const val AOD_MP3 = "https://download-media.srf.ch/world/audio/Echo_der_Zeit_radio/2025/01/Echo_der_Zeit_radio_AUDI20250119_RS_0069_8a020b8274994bfdbc724cb0c6ed520c.mp3"
     const val AUDIO_LIVE_MP3 = "https://stream.srg-ssr.ch/m/la-1ere/mp3_128"
     const val AUDIO_LIVE_DVR_HLS = "https://lsaplus.swisstxt.ch/audio/couleur3_96.stream/playlist.m3u8"
 }