Bump the androidx group with 4 updates (#673)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Gaëtan Muller <[email protected]>
Co-authored-by: Joaquim Stähli <[email protected]>

Author: 3 people

gradle/libs.versions.toml

@@ -2,20 +2,19 @@
 accompanist = "0.34.0"
 android-gradle-plugin = "8.5.2"
 androidx-activity = "1.9.1"
-androidx-annotation = "1.8.1"
+androidx-annotation = "1.8.2"
 androidx-compose = "2024.06.00"
 androidx-core = "1.13.1"
 androidx-fragment = "1.8.2"
 androidx-lifecycle = "2.8.4"
 androidx-media3 = "1.4.0"
 androidx-navigation = "2.7.7"
-androidx-paging = "3.3.1"
+androidx-paging = "3.3.2"
 androidx-test-core = "1.6.1"
 androidx-test-ext-junit = "1.2.1"
 androidx-test-monitor = "1.7.1"
 androidx-test-runner = "1.6.1"
-androidx-tv-foundation = "1.0.0-alpha10"
-androidx-tv-material = "1.0.0-beta01"
+androidx-tv-material = "1.0.0-rc02"
 coil = "2.7.0"
 comscore = "6.11.1"
 dependency-analysis-gradle-plugin = "1.33.0"
@@ -59,7 +58,6 @@ androidx-paging-compose = { module = "androidx.paging:paging-compose", version.r
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test-core" }
 androidx-test-monitor = { module = "androidx.test:monitor", version.ref = "androidx-test-monitor" }
 androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
-androidx-tv-foundation = { module = "androidx.tv:tv-foundation", version.ref = "androidx-tv-foundation" }
 androidx-tv-material = { module = "androidx.tv:tv-material", version.ref = "androidx-tv-material" }
 coil = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
 coil-base = { module = "io.coil-kt:coil-compose-base", version.ref = "coil" }

pillarbox-demo-tv/build.gradle.kts

@@ -39,7 +39,6 @@ dependencies {
     implementation(libs.androidx.navigation.runtime)
     implementation(libs.androidx.paging.common)
     implementation(libs.androidx.paging.compose)
-    implementation(libs.androidx.tv.foundation)
     implementation(libs.androidx.tv.material)
     implementation(libs.coil)
     implementation(libs.coil.base)

pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/examples/ExamplesHome.kt

@@ -12,6 +12,10 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
@@ -45,10 +49,6 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
-import androidx.tv.foundation.lazy.grid.TvGridCells
-import androidx.tv.foundation.lazy.grid.TvLazyVerticalGrid
-import androidx.tv.foundation.lazy.grid.itemsIndexed
-import androidx.tv.foundation.lazy.grid.rememberTvLazyGridState
 import androidx.tv.material3.Card
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
@@ -203,10 +203,10 @@ private fun <T> ExamplesSection(
         }
 
         val coroutineScope = rememberCoroutineScope()
-        val scrollState = rememberTvLazyGridState()
+        val scrollState = rememberLazyGridState()
 
-        TvLazyVerticalGrid(
-            columns = TvGridCells.Fixed(columnCount),
+        LazyVerticalGrid(
+            columns = GridCells.Fixed(columnCount),
             modifier = Modifier
                 .focusRestorer()
                 .onDpadEvent(

pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/lists/ListsHome.kt

@@ -13,6 +13,11 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.GridItemSpan
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.itemsIndexed
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Headset
 import androidx.compose.material.icons.filled.Movie
@@ -56,11 +61,6 @@ import androidx.paging.PagingData
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
-import androidx.tv.foundation.lazy.grid.TvGridCells
-import androidx.tv.foundation.lazy.grid.TvGridItemSpan
-import androidx.tv.foundation.lazy.grid.TvLazyVerticalGrid
-import androidx.tv.foundation.lazy.grid.itemsIndexed
-import androidx.tv.foundation.lazy.grid.rememberTvLazyGridState
 import androidx.tv.material3.Card
 import androidx.tv.material3.CardColors
 import androidx.tv.material3.CardDefaults
@@ -273,10 +273,10 @@ private fun <T> ListsSection(
         }
 
         val coroutineScope = rememberCoroutineScope()
-        val scrollState = rememberTvLazyGridState()
+        val scrollState = rememberLazyGridState()
 
-        TvLazyVerticalGrid(
-            columns = TvGridCells.Fixed(columnCount),
+        LazyVerticalGrid(
+            columns = GridCells.Fixed(columnCount),
             modifier = Modifier
                 .focusRestorer()
                 .onDpadEvent(
@@ -437,10 +437,10 @@ private fun <T : Content> ListsSectionContent(
         }
 
         val coroutineScope = rememberCoroutineScope()
-        val scrollState = rememberTvLazyGridState()
+        val scrollState = rememberLazyGridState()
 
-        TvLazyVerticalGrid(
-            columns = TvGridCells.Fixed(columnCount),
+        LazyVerticalGrid(
+            columns = GridCells.Fixed(columnCount),
             modifier = modifier
                 .focusRestorer()
                 .onDpadEvent(
@@ -510,7 +510,7 @@ private fun <T : Content> ListsSectionContent(
             if (items.loadState.append is LoadState.Loading) {
                 item(
                     contentType = "LoadingView",
-                    span = { TvGridItemSpan(columnCount) }
+                    span = { GridItemSpan(columnCount) }
                 ) {
                     ListsSectionLoading(
                         modifier = modifier

pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/compose/settings/PlaybackSettingsDrawer.kt

@@ -14,6 +14,8 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.HearingDisabled
@@ -41,8 +43,6 @@ import androidx.media3.common.Player
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import androidx.tv.foundation.lazy.list.TvLazyColumn
-import androidx.tv.foundation.lazy.list.items
 import androidx.tv.material3.DrawerState
 import androidx.tv.material3.DrawerValue
 import androidx.tv.material3.Icon
@@ -254,7 +254,7 @@ private fun <T> NavigationDrawerScope.GenericSetting(
             style = MaterialTheme.typography.titleMedium
         )
 
-        TvLazyColumn(
+        LazyColumn(
             contentPadding = PaddingValues(vertical = MaterialTheme.paddings.baseline),
             verticalArrangement = Arrangement.spacedBy(MaterialTheme.paddings.baseline)
         ) {
@@ -289,7 +289,7 @@ private fun NavigationDrawerScope.TracksSetting(
             style = MaterialTheme.typography.titleMedium
         )
 
-        TvLazyColumn(
+        LazyColumn(
             contentPadding = PaddingValues(vertical = MaterialTheme.paddings.baseline),
             verticalArrangement = Arrangement.spacedBy(MaterialTheme.paddings.baseline)
         ) {