Skip to content

Commit

Permalink
[0.6.x] version bumps to stable (#2377)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yschimke
yschimke authored Sep 9, 2024
1 parent 83ede28 commit a03a435
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 17 deletions.
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ androidx-concurrent = "1.2.0"
androidx-datastore = "1.1.1"
androidx-health-services = "1.0.0-rc02"
androidx-hilt = "1.2.0"
androidx-media3 = "1.3.1"
androidx-media3 = "1.4.1"
androidx-test-espresso = "3.6.1"
androidx-test-ext = "1.2.1"
androidx-test-runner = "1.6.2"
androidx-wear-watchface = "1.2.1"
androidxActivity = "1.9.1"
androidxActivity = "1.9.2"
androidxCore = "1.13.1"
androidxLifecycle = "2.8.4"
androidxNavigation = "2.8.0-rc01"
androidxLifecycle = "2.8.5"
androidxNavigation = "2.8.0"
androidxPhoneInteractions = "1.1.0-alpha04"
androidxRemoteInteractions = "1.1.0-beta01"
androidxStartup = "1.1.1"
Expand All @@ -28,11 +28,11 @@ annotation = "1.0.1"
app-cash-turbine = "1.1.0"
com-squareup-okhttp3 = "5.0.0-alpha.14"
com-squareup-retrofit2 = "2.11.0"
compose = "1.7.0-rc01"
compose = "1.7.0"
compose-compiler = "1.5.14"
compose-material3 = "1.3.0-rc01"
compose-material3 = "1.3.0"
composesnapshot = "-"
dependencyAnalysis = "1.32.0"
dependencyAnalysis = "2.0.1"
dokka = "1.9.20"
googledagger = "2.52"
gradlePlugin = "8.4.2"
Expand All @@ -49,14 +49,14 @@ moshi = "1.15.1"
okio = "3.9.0"
org-robolectric = "4.13"
playServicesAuth = "21.2.0"
protobuf = "4.27.3"
protobuf = "4.28.0"
roborazzi = "1.26.0"
room = "2.6.1"
runtimeTracing = "1.0.0-beta01"
spotless = "6.25.0"
tiles-tooling-preview = "1.4.0"
truth = "1.4.4"
wearcompose = "1.4.0-rc01"
wearcompose = "1.4.0"
wearToolingPreview = "1.0.0"
appcompat = "1.7.0"
material = "1.12.0"
Expand Down Expand Up @@ -139,7 +139,7 @@ coil-test = { module = "io.coil-kt:coil-test", version.ref = "io-coil-kt" }
com-squareup-okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "com-squareup-okhttp3" }
com-squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "com-squareup-okhttp3" }
com-squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "com-squareup-okhttp3" }
compose-bom = "androidx.compose:compose-bom:2024.08.00"
compose-bom = "androidx.compose:compose-bom:2024.09.00"
compose-foundation-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
compose-foundation-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "compose" }
compose-material-iconscore = { module = "androidx.compose.material:material-icons-core", version.ref = "compose" }
Expand Down Expand Up @@ -181,7 +181,7 @@ kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-
kotlinx-coroutines-playservices = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "kotlinxCoroutine" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutine" }
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerialization" }
lottie-compose = "com.airbnb.android:lottie-compose:6.5.0"
lottie-compose = "com.airbnb.android:lottie-compose:6.5.1"
mikepenz-markdown = "com.mikepenz:multiplatform-markdown-renderer:0.20.0-coil2"
moshi-adapters = { module = "com.squareup.moshi:moshi-adapters", version.ref = "moshi" }
moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
Expand Down
11 changes: 8 additions & 3 deletions ...ava/com/google/android/horologist/media3/service/SuspendingMediaLibrarySessionCallback.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@

package com.google.android.horologist.media3.service

import android.annotation.SuppressLint
import androidx.media3.common.MediaItem
import androidx.media3.session.LibraryResult
import androidx.media3.session.MediaLibraryService
import androidx.media3.session.MediaLibraryService.MediaLibrarySession
import androidx.media3.session.MediaSession
import androidx.media3.session.SessionError
import com.google.android.horologist.annotations.ExperimentalHorologistApi
import com.google.android.horologist.media3.logging.ErrorReporter
import com.google.common.collect.ImmutableList
Expand All @@ -39,6 +41,7 @@ public abstract class SuspendingMediaLibrarySessionCallback(
private val appEventLogger: ErrorReporter,
) :
MediaLibrarySession.Callback {
@SuppressLint("UnsafeOptInUsageError")
override fun onGetLibraryRoot(
session: MediaLibrarySession,
browser: MediaSession.ControllerInfo,
Expand All @@ -53,7 +56,7 @@ public abstract class SuspendingMediaLibrarySessionCallback(
ErrorReporter.Category.App,
ErrorReporter.Level.Error,
)
LibraryResult.ofError(LibraryResult.RESULT_ERROR_BAD_VALUE)
LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
}
}
}
Expand All @@ -64,6 +67,7 @@ public abstract class SuspendingMediaLibrarySessionCallback(
params: MediaLibraryService.LibraryParams?,
): LibraryResult<MediaItem>

@SuppressLint("UnsafeOptInUsageError")
override fun onGetItem(
session: MediaLibrarySession,
browser: MediaSession.ControllerInfo,
Expand All @@ -78,7 +82,7 @@ public abstract class SuspendingMediaLibrarySessionCallback(
ErrorReporter.Category.App,
ErrorReporter.Level.Error,
)
LibraryResult.ofError(LibraryResult.RESULT_ERROR_BAD_VALUE)
LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
}
}
}
Expand Down Expand Up @@ -119,6 +123,7 @@ public abstract class SuspendingMediaLibrarySessionCallback(
}.toMutableList()
}

@SuppressLint("UnsafeOptInUsageError")
override fun onGetChildren(
session: MediaLibrarySession,
browser: MediaSession.ControllerInfo,
Expand All @@ -136,7 +141,7 @@ public abstract class SuspendingMediaLibrarySessionCallback(
ErrorReporter.Category.App,
ErrorReporter.Level.Error,
)
LibraryResult.ofError(LibraryResult.RESULT_ERROR_BAD_VALUE)
LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
}
}
}
Expand Down
11 changes: 8 additions & 3 deletions ...e/android/horologist/mediasample/data/service/playback/UampMediaLibrarySessionCallback.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@

package com.google.android.horologist.mediasample.data.service.playback

import android.annotation.SuppressLint
import androidx.media3.common.MediaItem
import androidx.media3.session.LibraryResult
import androidx.media3.session.MediaLibraryService
import androidx.media3.session.MediaSession
import androidx.media3.session.SessionError
import com.google.android.horologist.media3.logging.ErrorReporter
import com.google.android.horologist.media3.service.SuspendingMediaLibrarySessionCallback
import com.google.common.collect.ImmutableList
Expand All @@ -29,24 +31,27 @@ class UampMediaLibrarySessionCallback(
serviceScope: CoroutineScope,
appEventLogger: ErrorReporter,
) : SuspendingMediaLibrarySessionCallback(serviceScope, appEventLogger) {
@SuppressLint("UnsafeOptInUsageError")
override suspend fun onGetLibraryRootInternal(
session: MediaLibraryService.MediaLibrarySession,
browser: MediaSession.ControllerInfo,
params: MediaLibraryService.LibraryParams?,
): LibraryResult<MediaItem> {
// TODO implement
return LibraryResult.ofError(LibraryResult.RESULT_ERROR_BAD_VALUE)
return LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
}

@SuppressLint("UnsafeOptInUsageError")
override suspend fun onGetItemInternal(
session: MediaLibraryService.MediaLibrarySession,
browser: MediaSession.ControllerInfo,
mediaId: String,
): LibraryResult<MediaItem> {
// TODO implement
return LibraryResult.ofError(LibraryResult.RESULT_ERROR_BAD_VALUE)
return LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
}

@SuppressLint("UnsafeOptInUsageError")
override suspend fun onGetChildrenInternal(
session: MediaLibraryService.MediaLibrarySession,
browser: MediaSession.ControllerInfo,
Expand All @@ -56,6 +61,6 @@ class UampMediaLibrarySessionCallback(
params: MediaLibraryService.LibraryParams?,
): LibraryResult<ImmutableList<MediaItem>> {
// TODO implement
return LibraryResult.ofError(LibraryResult.RESULT_ERROR_BAD_VALUE)
return LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
}
}

0 comments on commit a03a435

Please sign in to comment.