Bump the androidx group with 4 updates (#522)

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]>
SRGSSR · May 8, 2024 · f042e96 · f042e96
1 parent c71d60d
commit f042e96
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 48 deletions.
diff --git a/build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/internal/AppConfig.kt b/build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/internal/AppConfig.kt
@@ -10,7 +10,7 @@ internal object AppConfig {
     internal const val minSdk = 21
     internal const val targetSdk = 34
     internal const val compileSdk = 34
-    internal const val androidXComposeCompiler = "1.5.12"
+    internal const val androidXComposeCompiler = "1.5.13"
 
     // When changing this value, don't forget to also update the Detekt config in the root `build.gradle.kts` file
     internal val javaVersion = JavaVersion.VERSION_17

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,9 +3,9 @@ accompanist = "0.34.0"
 android-gradle-plugin = "8.3.2"
 androidx-activity = "1.9.0"
 androidx-annotation = "1.7.1"
-androidx-compose = "2024.04.01"
-androidx-core = "1.13.0"
-androidx-fragment = "1.6.2"
+androidx-compose = "2024.05.00"
+androidx-core = "1.13.1"
+androidx-fragment = "1.7.0"
 androidx-leanback = "1.0.0"
 androidx-lifecycle = "2.7.0"
 androidx-media = "1.7.0"
@@ -16,7 +16,8 @@ androidx-test-core = "1.5.0"
 androidx-test-ext-junit = "1.1.5"
 androidx-test-monitor = "1.6.1"
 androidx-test-runner = "1.5.2"
-androidx-tv = "1.0.0-alpha10"
+androidx-tv-foundation = "1.0.0-alpha10"
+androidx-tv-material = "1.0.0-beta01"
 coil = "2.6.0"
 comscore = "6.11.1"
 dependency-analysis-gradle-plugin = "1.31.0"
@@ -61,8 +62,8 @@ 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" }
-androidx-tv-material = { module = "androidx.tv:tv-material", version.ref = "androidx-tv" }
+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" }
 json = { module = "org.json:json", version.ref = "json" }

diff --git a/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/MainActivity.kt b/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/MainActivity.kt
@@ -23,7 +23,6 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.LocalContentColor
 import androidx.tv.material3.MaterialTheme
 import ch.srgssr.pillarbox.demo.shared.ui.HomeDestination
@@ -38,7 +37,6 @@ import ch.srgssr.pillarbox.demo.tv.ui.theme.paddings
  * @constructor Create empty Main activity
  */
 class MainActivity : ComponentActivity() {
-    @OptIn(ExperimentalTvMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

diff --git a/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/MainNavigation.kt b/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/MainNavigation.kt
@@ -15,7 +15,6 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import ch.srgssr.pillarbox.demo.shared.di.PlayerModule
 import ch.srgssr.pillarbox.demo.shared.ui.HomeDestination
@@ -36,7 +35,6 @@ import ch.srgssr.pillarbox.demo.tv.ui.theme.paddings
  * @param modifier The [Modifier] to apply to the [NavHost].
  */
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 fun MainNavigation(
     navController: NavHostController,
     startDestination: HomeDestination,

diff --git a/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/components/TVDemoTopBar.kt b/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/components/TVDemoTopBar.kt
@@ -23,7 +23,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Tab
 import androidx.tv.material3.TabRow
@@ -42,7 +41,7 @@ import ch.srgssr.pillarbox.demo.tv.ui.theme.paddings
  * @param onDestinationClick The action to perform the selected a destination.
  */
 @Composable
-@OptIn(ExperimentalComposeUiApi::class, ExperimentalTvMaterial3Api::class)
+@OptIn(ExperimentalComposeUiApi::class)
 fun TVDemoTopBar(
     destinations: List<HomeDestination>,
     currentNavDestination: NavDestination?,

diff --git a/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/examples/ExamplesHome.kt b/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/examples/ExamplesHome.kt
@@ -50,7 +50,6 @@ 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.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import ch.srgssr.pillarbox.demo.shared.data.DemoItem
@@ -70,7 +69,6 @@ import kotlinx.coroutines.launch
  * @receiver
  */
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 fun ExamplesHome(
     modifier: Modifier = Modifier,
     onItemSelected: (DemoItem) -> Unit = {},
@@ -173,7 +171,7 @@ fun ExamplesHome(
 }
 
 @Composable
-@OptIn(ExperimentalComposeUiApi::class, ExperimentalTvMaterial3Api::class)
+@OptIn(ExperimentalComposeUiApi::class)
 private fun <T> ExamplesSection(
     columnCount: Int,
     modifier: Modifier = Modifier,

diff --git a/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/lists/ListsHome.kt b/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/lists/ListsHome.kt
@@ -64,7 +64,6 @@ import androidx.tv.foundation.lazy.grid.rememberTvLazyGridState
 import androidx.tv.material3.Card
 import androidx.tv.material3.CardColors
 import androidx.tv.material3.CardDefaults
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
@@ -108,7 +107,6 @@ import ch.srgssr.pillarbox.demo.shared.R as sharedR
  * @see ContentListSection
  */
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 fun ListsHome(
     sections: List<ContentListSection>,
     modifier: Modifier = Modifier
@@ -242,7 +240,7 @@ fun ListsHome(
 }
 
 @Composable
-@OptIn(ExperimentalComposeUiApi::class, ExperimentalTvMaterial3Api::class)
+@OptIn(ExperimentalComposeUiApi::class)
 private fun <T> ListsSection(
     modifier: Modifier = Modifier,
     title: String? = null,
@@ -365,7 +363,6 @@ private fun <T> ListsSection(
  * @param emptyScreen The content to display when the list is empty.
  */
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 fun <T : Content> ListsSection(
     modifier: Modifier = Modifier,
     title: String? = null,
@@ -406,7 +403,6 @@ fun <T : Content> ListsSection(
 }
 
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 private fun ListsSectionLoading(modifier: Modifier = Modifier) {
     Box(
         modifier = modifier,
@@ -417,7 +413,7 @@ private fun ListsSectionLoading(modifier: Modifier = Modifier) {
 }
 
 @Composable
-@OptIn(ExperimentalComposeUiApi::class, ExperimentalTvMaterial3Api::class)
+@OptIn(ExperimentalComposeUiApi::class)
 private fun <T : Content> ListsSectionContent(
     items: LazyPagingItems<T>,
     modifier: Modifier = Modifier,
@@ -560,7 +556,6 @@ private fun ContentCard(
 }
 
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 private fun MediaContent(
     media: Content.Media,
     imageUrl: String,
@@ -633,7 +628,6 @@ private fun MediaContent(
 }
 
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 private fun CategoryContent(
     title: String,
     imageUrl: String?,
@@ -681,7 +675,6 @@ private fun CategoryContent(
 }
 
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 private fun ListsSectionError(
     throwable: Throwable,
     modifier: Modifier = Modifier

diff --git a/...-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/compose/MediaMetadataView.kt b/...-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/compose/MediaMetadataView.kt
@@ -26,7 +26,6 @@ import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.media3.common.MediaMetadata
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import ch.srgssr.pillarbox.demo.tv.ui.theme.PillarboxTheme
@@ -39,7 +38,6 @@ import coil.compose.AsyncImage
  * @param mediaMetadata The [MediaMetadata] to display.
  * @param modifier The Modifier.
  */
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun MediaMetadataView(
     mediaMetadata: MediaMetadata,

diff --git a/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/compose/PlayerView.kt b/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/compose/PlayerView.kt
@@ -33,7 +33,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.media3.common.Player
 import androidx.tv.material3.Button
 import androidx.tv.material3.DrawerValue
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.IconButton
 import androidx.tv.material3.MaterialTheme
@@ -62,7 +61,6 @@ import kotlin.time.Duration.Companion.seconds
  * @param modifier
  */
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 fun PlayerView(
     player: Player,
     modifier: Modifier = Modifier
@@ -162,7 +160,8 @@ fun PlayerView(
                         transitionSpec = {
                             slideInHorizontally { it }
                                 .togetherWith(slideOutHorizontally { -it })
-                        }
+                        },
+                        label = "media_metadata_transition",
                     ) { mediaMetadata ->
                         MediaMetadataView(mediaMetadata)
                     }

diff --git a/...mo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/compose/controls/PlayerError.kt b/...mo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/compose/controls/PlayerError.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.media3.common.PlaybackException
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Text
 import ch.srgssr.pillarbox.core.business.SRGErrorMessageProvider
 
@@ -28,7 +27,6 @@ import ch.srgssr.pillarbox.core.business.SRGErrorMessageProvider
  * @param onRetry Action to retry.
  * @receiver
  */
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun PlayerError(playerError: PlaybackException, modifier: Modifier = Modifier, onRetry: () -> Unit) {
     val context = LocalContext.current

diff --git a/...src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/compose/controls/PlayerPlaybackRow.kt b/...src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/compose/controls/PlayerPlaybackRow.kt
@@ -21,7 +21,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.media3.common.Player
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.IconButton
 import androidx.tv.material3.MaterialTheme
@@ -42,7 +41,6 @@ import ch.srgssr.pillarbox.ui.widget.DelayedVisibilityState
  * @param state
  * @param modifier
  */
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun PlayerPlaybackRow(
     player: Player,

diff --git a/...ain/java/ch/srgssr/pillarbox/demo/tv/ui/player/compose/settings/PlaybackSettingsDrawer.kt b/...ain/java/ch/srgssr/pillarbox/demo/tv/ui/player/compose/settings/PlaybackSettingsDrawer.kt
@@ -45,7 +45,6 @@ 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.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.LocalContentColor
 import androidx.tv.material3.MaterialTheme
@@ -74,7 +73,6 @@ import ch.srgssr.pillarbox.player.tracks.VideoTrack
  * @param content The content to display behind the drawer.
  */
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 fun PlaybackSettingsDrawer(
     player: Player,
     drawerState: DrawerState,
@@ -118,7 +116,6 @@ fun PlaybackSettingsDrawer(
 }
 
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 private fun NavigationDrawerScope.NavigationDrawerNavHost(
     player: Player,
     modifier: Modifier = Modifier
@@ -237,7 +234,6 @@ private fun NavigationDrawerScope.NavigationDrawerNavHost(
 }
 
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 private fun <T> NavigationDrawerScope.GenericSetting(
     title: String,
     items: List<T>,
@@ -276,7 +272,6 @@ private fun <T> NavigationDrawerScope.GenericSetting(
 }
 
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 private fun NavigationDrawerScope.TracksSetting(
     tracksSetting: TracksSettingItem,
     modifier: Modifier = Modifier,

diff --git a/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/search/SearchHome.kt b/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/search/SearchHome.kt
@@ -60,7 +60,6 @@ import ch.srgssr.pillarbox.demo.tv.ui.theme.paddings
  * @param modifier The [Modifier] to apply to the list.
  */
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 fun SearchHome(
     searchViewModel: SearchViewModel,
     modifier: Modifier = Modifier
@@ -154,7 +153,6 @@ private fun SearchRow(
 }
 
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 private fun SearchInput(
     query: String,
     modifier: Modifier = Modifier,
@@ -216,7 +214,6 @@ private fun NoContent(
 }
 
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 private fun StateMessage(
     modifier: Modifier,
     message: String,

diff --git a/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/theme/Paddings.kt b/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/theme/Paddings.kt
@@ -10,7 +10,6 @@ import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 
 /**
@@ -30,7 +29,6 @@ class Paddings(
 /**
  * Retrieves the current [Paddings] at the call site's position in the hierarchy.
  */
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Suppress("UnusedReceiverParameter")
 val MaterialTheme.paddings: Paddings
     @Composable

diff --git a/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/theme/PillarboxTheme.kt b/pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/theme/PillarboxTheme.kt
@@ -7,7 +7,6 @@ package ch.srgssr.pillarbox.demo.tv.ui.theme
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.darkColorScheme
 import androidx.tv.material3.lightColorScheme
@@ -66,7 +65,6 @@ import ch.srgssr.pillarbox.demo.shared.ui.theme.md_theme_light_surfaceVariant
 import ch.srgssr.pillarbox.demo.shared.ui.theme.md_theme_light_tertiary
 import ch.srgssr.pillarbox.demo.shared.ui.theme.md_theme_light_tertiaryContainer
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 private val darkColorScheme = darkColorScheme(
     primary = md_theme_dark_primary,
     onPrimary = md_theme_dark_onPrimary,
@@ -97,7 +95,6 @@ private val darkColorScheme = darkColorScheme(
     scrim = md_theme_dark_scrim,
 )
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 private val lightColorScheme = lightColorScheme(
     primary = md_theme_light_primary,
     onPrimary = md_theme_light_onPrimary,
@@ -136,7 +133,6 @@ private val lightColorScheme = lightColorScheme(
  * @param content The content to display on the screen.
  */
 @Composable
-@OptIn(ExperimentalTvMaterial3Api::class)
 fun PillarboxTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     paddings: Paddings = MaterialTheme.paddings,