diff --git a/buildSrc/src/main/kotlin/library.gradle.kts b/buildSrc/src/main/kotlin/library.gradle.kts
index 5190e9d04..528579f3d 100644
--- a/buildSrc/src/main/kotlin/library.gradle.kts
+++ b/buildSrc/src/main/kotlin/library.gradle.kts
@@ -36,6 +36,7 @@ android {
             languageVersion.set(JavaLanguageVersion.of(21))
         }
         unitTests.all { it.javaLauncher.set(javaLauncher) }
+        unitTests.isReturnDefaultValues = true
     }
 
     buildTypes {
diff --git a/core/src/main/java/com/orange/ouds/core/theme/WindowWidthSizeClass.kt b/core/src/main/java/com/orange/ouds/core/theme/WindowWidthSizeClass.kt
index aca8d8bc3..1478e14ae 100644
--- a/core/src/main/java/com/orange/ouds/core/theme/WindowWidthSizeClass.kt
+++ b/core/src/main/java/com/orange/ouds/core/theme/WindowWidthSizeClass.kt
@@ -12,9 +12,9 @@
 
 package com.orange.ouds.core.theme
 
-import androidx.compose.material3.adaptive.currentWindowSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.toSize
@@ -79,4 +79,4 @@ enum class WindowWidthSizeClass {
  * Returns the current window width in dp.
  */
 @Composable
-internal fun currentWindowWidth() = with(LocalDensity.current) { currentWindowSize().toSize().toDpSize().width }
+internal fun currentWindowWidth() = with(LocalDensity.current) { LocalWindowInfo.current.containerSize.toSize().toDpSize().width }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 54775badd..9313792a0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ androidCompileSdk = "37"
 androidMinSdk = "23"
 androidTargetSdk = "37"
 browser = "1.10.0"
-composeBom = "2026.06.01"
+composeBom = "2026.08.00"
 constraintlayoutCompose = "1.1.2"
 core = "1.19.0"
 dokka = "2.2.0"