diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 17787d2dd..a941eb251 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
 android-gradle-plugin = "8.8.0"
-androidx-activity = "1.9.3"
+androidx-activity = "1.10.0"
 androidx-annotation = "1.9.1"
-androidx-compose = "2024.12.01"
+androidx-compose = "2025.01.00"
 androidx-core = "1.15.0"
-androidx-datastore = "1.1.1"
+androidx-datastore = "1.1.2"
 androidx-fragment = "1.8.5"
 androidx-lifecycle = "2.8.7"
 androidx-media3 = "1.5.1"
diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/DemoPlayerView.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/DemoPlayerView.kt
index d3edfc26a..5fb65fd22 100644
--- a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/DemoPlayerView.kt
+++ b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/player/DemoPlayerView.kt
@@ -6,7 +6,7 @@
 
 package ch.srgssr.pillarbox.demo.ui.player
 
-import android.app.Activity
+import androidx.activity.compose.LocalActivity
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.fadeIn
@@ -66,7 +66,7 @@ fun DemoPlayerView(
     pictureInPictureClick: (() -> Unit)? = null,
     displayPlaylist: Boolean = false,
 ) {
-    val windowSizeClass = calculateWindowSizeClass(LocalContext.current as Activity)
+    val windowSizeClass = calculateWindowSizeClass(checkNotNull(LocalActivity.current))
     val useSidePanel = windowSizeClass.widthSizeClass >= WindowWidthSizeClass.Medium
 
     if (useSidePanel) {