From e77047c9b44bf58ad4406af9fe30a7807cb8fdd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 15:40:24 +0000 Subject: [PATCH 1/2] Bump dokka from 2.0.0-Beta to 2.0.0 Bumps `dokka` from 2.0.0-Beta to 2.0.0. Updates `org.jetbrains.dokka:dokka-gradle-plugin` from 2.0.0-Beta to 2.0.0 - [Release notes](https://github.com/Kotlin/dokka/releases) - [Commits](https://github.com/Kotlin/dokka/compare/v2.0.0-Beta...v2.0.0) Updates `org.jetbrains.dokka` from 2.0.0-Beta to 2.0.0 - [Release notes](https://github.com/Kotlin/dokka/releases) - [Commits](https://github.com/Kotlin/dokka/compare/v2.0.0-Beta...v2.0.0) Updates `org.jetbrains.dokka-javadoc` from 2.0.0-Beta to 2.0.0 --- updated-dependencies: - dependency-name: org.jetbrains.dokka:dokka-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.dokka dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.dokka-javadoc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 07f801859..496df5bc2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ coil = "3.0.4" comscore = "6.11.1" dependency-analysis-gradle-plugin = "2.6.1" detekt = "1.23.7" -dokka = "2.0.0-Beta" +dokka = "2.0.0" guava = "33.3.1-android" json = "20240303" junit = "4.13.2" From 34c1731e1b2cebdd5a138d42f0c1747eb0dc96ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Mon, 16 Dec 2024 17:06:56 +0100 Subject: [PATCH 2/2] Enable K2 in Dokka and fix unknown references warnings. --- gradle.properties | 2 ++ .../pillarbox/player/session/PillarboxMediaLibrarySession.kt | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index f1d917fe5..43ec80927 100644 --- a/gradle.properties +++ b/gradle.properties @@ -49,3 +49,5 @@ detekt.use.worker.api=true # https://kotlinlang.org/docs/dokka-migration.html#migrate-your-project org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true +org.jetbrains.dokka.experimental.tryK2=true +org.jetbrains.dokka.experimental.tryK2.nowarn=true diff --git a/pillarbox-player/src/main/java/ch/srgssr/pillarbox/player/session/PillarboxMediaLibrarySession.kt b/pillarbox-player/src/main/java/ch/srgssr/pillarbox/player/session/PillarboxMediaLibrarySession.kt index 2081f1fe9..8b98582e1 100644 --- a/pillarbox-player/src/main/java/ch/srgssr/pillarbox/player/session/PillarboxMediaLibrarySession.kt +++ b/pillarbox-player/src/main/java/ch/srgssr/pillarbox/player/session/PillarboxMediaLibrarySession.kt @@ -7,13 +7,13 @@ package ch.srgssr.pillarbox.player.session import android.app.PendingIntent import androidx.annotation.IntRange import androidx.media3.common.MediaItem +import androidx.media3.common.MediaMetadata 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 ch.srgssr.pillarbox.player.PillarboxPlayer -import ch.srgssr.pillarbox.player.session.PillarboxMediaLibrarySession.Builder import ch.srgssr.pillarbox.player.utils.PendingIntentUtils import com.google.common.collect.ImmutableList import com.google.common.util.concurrent.Futures @@ -21,8 +21,7 @@ import com.google.common.util.concurrent.ListenableFuture /** * An extended [PillarboxMediaSession] for the [PillarboxMediaLibraryService]. - * Build an instance with [Builder] and return it from [PillarboxMediaLibraryService.onGetPillarboxSession] - * or [PillarboxMediaLibraryService.onGetSession] with [PillarboxMediaLibrarySession.mediaSession]. + * Build an instance with [Builder] and return it from [PillarboxMediaLibraryService.onGetSession] with [PillarboxMediaLibrarySession.mediaSession]. * * @see MediaLibrarySession * @see PillarboxMediaLibraryService