build: Upgrade project to java 21 version

core/designsystem/build.gradle.kts

@@ -57,4 +57,5 @@ dependencies {
     testImplementation(libs.junit)
 
     androidTestImplementation(libs.androidx.junit.test.ext)
+    debugImplementation(libs.androidx.ui.tooling)
 }

core/model/build.gradle.kts

@@ -4,6 +4,6 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }

core/network/src/main/java/com/example/mymusic/core/network/model/PlaybackStateResponse.kt

@@ -0,0 +1,61 @@
+package com.example.mymusic.core.network.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Device(
+    val id: String?,
+    @SerialName("is_active")
+    val isActive: Boolean,
+    @SerialName("is_private_session")
+    val isPrivateSession: Boolean,
+    @SerialName("is_restricted")
+    val isRestricted: Boolean,
+    val name: String,
+    val type: String,
+    @SerialName("volume_percent")
+    val volumePercent: Int?,
+    @SerialName("supports_volume")
+    val supportsVolume: Boolean
+)
+
+@Serializable
+data class Actions(
+    @SerialName("interrupting_playback")
+    val interruptingPlayback: Boolean,
+    val pausing: Boolean,
+    val resuming: Boolean,
+    val seeking: Boolean,
+    @SerialName("skipping_next")
+    val skippingNext: Boolean,
+    @SerialName("skipping_prev")
+    val skippingPrev: Boolean,
+    @SerialName("toggling_repeat_context")
+    val togglingRepeatContext: Boolean,
+    @SerialName("toggling_shuffle")
+    val togglingShuffle: Boolean,
+    @SerialName("toggling_repeat_track")
+    val togglingRepeatTrack: Boolean,
+    @SerialName("transferring_playback")
+    val transferringPlayback: Boolean
+)
+
+@Serializable
+data class PlaybackStateResponse(
+    val device: Device,
+    @SerialName("repeat_state")
+    val repeatState: Boolean,
+    @SerialName("shuffle_state")
+    val shuffleState: Boolean,
+    val context: Context,
+    val timestamp: Int,
+    @SerialName("progress_ms")
+    val progressMs: Int,
+    @SerialName("is_playing")
+    val isPlaying: Boolean,
+    val item: SpotifyTrack, // TODO: OneOf issue
+    @SerialName("currently_playing_type")
+    val currentlyPlayingType: String,
+    val actions: Actions
+)

feature/library/src/main/java/com/example/mymusic/feature/library/LibraryScreen.kt

@@ -74,13 +74,13 @@ fun LibraryScreen(
     val authenticatedUiState by viewModel.authenticatedUiState.collectAsStateWithLifecycle()
 
     // If not authorized - navigate to login screen
-    if (authenticatedUiState is com.example.mymusic.feature.home.AuthenticatedUiState.NotAuthenticated) {
+    if (authenticatedUiState is AuthenticatedUiState.NotAuthenticated) {
         LaunchedEffect(key1 = authenticatedUiState) {
             onNavigateToLogin()
         }
     }
     // Show ui if the data is ready and user is authorized
-    else if (authenticatedUiState is com.example.mymusic.feature.home.AuthenticatedUiState.Success && !isSyncing) {
+    else if (authenticatedUiState is AuthenticatedUiState.Success && !isSyncing) {
 
         val savedAlbums = viewModel.savedAlbums.collectAsLazyPagingItems()
         val savedPlaylists = viewModel.savedPlaylists.collectAsLazyPagingItems()
@@ -99,7 +99,7 @@ fun LibraryScreen(
         )
     } else {
         LibraryContent(
-            uiState = com.example.mymusic.feature.home.AuthenticatedUiState.Loading,
+            uiState = AuthenticatedUiState.Loading,
             albums = flowOf(PagingData.from(emptyList<com.example.mymusic.core.model.SimplifiedAlbum>())).collectAsLazyPagingItems(),
             playlists = flowOf(PagingData.from(emptyList<com.example.mymusic.core.model.SimplifiedPlaylist>())).collectAsLazyPagingItems(),
             onSortOptionChanged =  { viewModel.currentSortOption.value = it },
@@ -115,7 +115,7 @@ fun LibraryScreen(
 
 @Composable
 fun LibraryContent(
-    uiState: com.example.mymusic.feature.home.AuthenticatedUiState,
+    uiState: AuthenticatedUiState,
     albums: LazyPagingItems<com.example.mymusic.core.model.SimplifiedAlbum>,
     playlists: LazyPagingItems<com.example.mymusic.core.model.SimplifiedPlaylist>,
     onSortOptionChanged: (SortOption) -> Unit,
@@ -191,14 +191,14 @@ fun LibraryContent(
                         ))
                     ) {
                         ScreenHeader(
-                            isLoading = uiState is com.example.mymusic.feature.home.AuthenticatedUiState.Loading,
+                            isLoading = uiState is AuthenticatedUiState.Loading,
                             titleRes = R.string.your_library,
                             AccountDialog = {
                                 com.example.mymusic.feature.account.AccountDialog(
                                     onDismiss = it
                                 )
                             },
-                            imageUrl = if (uiState is com.example.mymusic.feature.home.AuthenticatedUiState.Success) uiState.userImageUrl ?: "" else "",
+                            imageUrl = if (uiState is AuthenticatedUiState.Success) uiState.userImageUrl ?: "" else "",
                             modifier = Modifier.padding(horizontal = 16.dp))
                         Sort(
                             sortOption = currentSortOption,
@@ -209,7 +209,7 @@ fun LibraryContent(
                     }
                 }
                 when (uiState) {
-                    com.example.mymusic.feature.home.AuthenticatedUiState.Loading -> {
+                    AuthenticatedUiState.Loading -> {
                         items(count = 5) {
                             AnimationBox {
                                 RectangleRoundedCornerPlaceholder(
@@ -221,8 +221,8 @@ fun LibraryContent(
                             }
                         }
                     }
-                    com.example.mymusic.feature.home.AuthenticatedUiState.NotAuthenticated -> Unit
-                    is com.example.mymusic.feature.home.AuthenticatedUiState.Success -> {
+                    AuthenticatedUiState.NotAuthenticated -> Unit
+                    is AuthenticatedUiState.Success -> {
                         albumsList(albums, onNavigateToAlbumClick, onAlbumClick)
                         playlistsList(playlists, onNavigateToPlaylist, onPlaylistClick)
                     }
@@ -321,7 +321,7 @@ private fun TopAppBar(
 fun LibraryPreview() {
     MyMusicTheme {
         LibraryContent(
-            uiState = com.example.mymusic.feature.home.AuthenticatedUiState.Success(""),
+            uiState = AuthenticatedUiState.Success(""),
             albums = flowOf(PagingData.from(PreviewParameterData.simplifiedAlbums)).collectAsLazyPagingItems(),
             playlists = flowOf(PagingData.from(PreviewParameterData.simplifiedPlaylists)).collectAsLazyPagingItems(),
             onSortOptionChanged = {},
@@ -339,7 +339,7 @@ fun LibraryPreview() {
 fun LibraryLoadingPreview() {
     MyMusicTheme {
         LibraryContent(
-            uiState = com.example.mymusic.feature.home.AuthenticatedUiState.Loading,
+            uiState = AuthenticatedUiState.Loading,
             albums = flowOf(PagingData.from(PreviewParameterData.simplifiedAlbums)).collectAsLazyPagingItems(),
             playlists = flowOf(PagingData.from(PreviewParameterData.simplifiedPlaylists)).collectAsLazyPagingItems(),
             onSortOptionChanged = {},

gradle/libs.versions.toml

@@ -3,38 +3,38 @@ appauth = "0.11.1"
 converter-gson = "2.11.0"
 core = "1.6.1"
 kotlin = "2.0.0"
-android-gradle-plugin = "8.4.2"
-androidx-compose-bom = "2024.09.02"
+android-gradle-plugin = "8.7.3"
+androidx-compose-bom = "2024.12.01"
 hilt-navigation-compose = "1.2.0"
-activity-compose = "1.9.2"
+activity-compose = "1.9.3"
 datastore = "1.1.1"
 kotlinx-serialization-json = "1.7.1"
-ktx = "1.13.1"
+ktx = "1.15.0"
 ksp = "2.0.0-1.0.21"
 coil = "2.7.0"
 network-response-adapter = "5.0.0"
 palette = "1.0.0"
-navigation-compose = "2.8.1"
-lifecycle-runtime-ktx = "2.8.6"
-constraintlayout-compose = "1.0.1"
+navigation-compose = "2.8.5"
+lifecycle-runtime-ktx = "2.8.7"
+constraintlayout-compose = "1.1.0"
 gson = "2.11.0"
 junit = "4.13.2"
 junit-test = "1.2.1"
 espresso = "3.6.1"
 hilt = "2.52"
-lifecycle-runtime-compose = "2.8.6"
+lifecycle-runtime-compose = "2.8.7"
 plugin-serailization = "2.0.0"
 retrofit = "2.11.0"
 room = "2.6.1"
-work-runtime-ktx = "2.9.1"
+work-runtime-ktx = "2.10.0"
 hilt-common = "1.2.0"
 hilt-work = "1.2.0"
 hilt-compiler = "1.2.0"
-paging = "3.3.2"
+paging = "3.3.5"
 paging-room = "2.6.1"
 logging-interceptor = "4.12.0"
 jetbrains-kotlin-jvm = "2.0.0"
-annotation-jvm = "1.8.2"
+annotation-jvm = "1.9.1"
 appcompat = "1.7.0"
 material = "1.12.0"
 runner = "1.6.2"
@@ -43,6 +43,7 @@ kotlinx-coroutnies-test-jvm = "1.8.1"
 core-ktx = "1.6.1"
 junit-ktx = "1.2.1"
 junit-ktx-version = "1.2.1"
+ui-tooling = "1.7.6"
 
 [libraries]
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx-compose-bom" }
@@ -100,6 +101,7 @@ material = { group = "com.google.android.material", name = "material", version.r
 androidx-runner = { group = "androidx.test", name = "runner", version.ref = "runner" }
 androidx-core-ktx = { group = "androidx.test", name = "core-ktx", version.ref = "core-ktx" }
 androidx-junit-ktx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "junit-ktx-version" }
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "ui-tooling" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed May 01 17:34:00 MSK 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists