Merge branch 'main' into migrate_last_android_test

Author: MGaetan89

.github/workflows/build_windows.yml

@@ -29,5 +29,4 @@ jobs:
         run: >
           ./gradlew
           :pillarbox-demo:assembleProdDebug
-          :pillarbox-demo-cast:assembleDebug
           :pillarbox-demo-tv:assembleDebug

.github/workflows/quality.yml

@@ -34,7 +34,6 @@ jobs:
         run: >
           ./gradlew
           :pillarbox-demo:lintProdDebug
-          :pillarbox-demo-cast:lintDebug
           :pillarbox-demo-tv:lintDebug
           :pillarbox-player-testutils:lintDebug
       - name: Upload Android Lint results
@@ -116,7 +115,7 @@ jobs:
         run: ./gradlew :build-logic:plugins:koverXmlReport koverXmlReportDebug
       - name: Report Code Coverage
         if: ${{ github.event_name == 'pull_request' }}
-        uses: madrapps/[email protected].1
+        uses: madrapps/[email protected].2
         with:
           paths: ${{ github.workspace }}/**/build/reports/kover/**.xml
           token: ${{ github.token }}

.github/workflows/release.yml

@@ -37,6 +37,9 @@ jobs:
       USERNAME: ${{ github.actor }}
       GITHUB_TOKEN: ${{ github.token }}
       VERSION_NAME: ${{ github.ref_name }}
+      SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4

build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/PillarboxAndroidApplicationPlugin.kt

@@ -9,10 +9,12 @@ import ch.srgssr.pillarbox.gradle.internal.VersionConfig
 import ch.srgssr.pillarbox.gradle.internal.configureAndroidLintModule
 import ch.srgssr.pillarbox.gradle.internal.configureAndroidModule
 import ch.srgssr.pillarbox.gradle.internal.configureKotlinModule
+import ch.srgssr.pillarbox.gradle.internal.libs
 import com.android.build.api.dsl.ApplicationExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.extra
 
 /**
@@ -69,5 +71,9 @@ class PillarboxAndroidApplicationPlugin : Plugin<Project> {
                 }
             }
         }
+
+        dependencies {
+            add("coreLibraryDesugaring", libs.findLibrary("desugar_jdk_libs").get())
+        }
     }
 }

build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/PillarboxAndroidLibraryPlugin.kt

@@ -6,10 +6,12 @@ package ch.srgssr.pillarbox.gradle
 
 import ch.srgssr.pillarbox.gradle.internal.configureAndroidModule
 import ch.srgssr.pillarbox.gradle.internal.configureKotlinModule
+import ch.srgssr.pillarbox.gradle.internal.libs
 import com.android.build.api.dsl.LibraryExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
 
 /**
  * Custom Gradle plugin to configure an Android library module for Pillarbox.
@@ -22,7 +24,6 @@ class PillarboxAndroidLibraryPlugin : Plugin<Project> {
 
         extensions.configure<LibraryExtension> {
             configureAndroidModule(this)
-
             defaultConfig {
                 consumerProguardFiles("consumer-rules.pro")
             }
@@ -35,7 +36,10 @@ class PillarboxAndroidLibraryPlugin : Plugin<Project> {
                 }
             }
         }
-
         configureKotlinModule()
+
+        dependencies {
+            add("coreLibraryDesugaring", libs.findLibrary("desugar_jdk_libs").get())
+        }
     }
 }

build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/PillarboxAndroidLibraryPublishingPlugin.kt

@@ -86,6 +86,19 @@ class PillarboxAndroidLibraryPublishingPlugin : Plugin<Project> {
                             .get()
                     }
                 }
+                maven {
+                    name = "SRGSSRMaven"
+                    url = uri("https://nxrm.rts.ch/repository/maven-srgssr-releases/")
+
+                    credentials {
+                        username = providers.gradleProperty("sonatypeUsername")
+                            .orElse(providers.environmentVariable("SONATYPE_USERNAME"))
+                            .orNull
+                        password = providers.gradleProperty("sonatypePassword")
+                            .orElse(providers.environmentVariable("SONATYPE_PASSWORD"))
+                            .orNull
+                    }
+                }
             }
         }
 

build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/PillarboxAndroidLibraryTestedModulePlugin.kt

@@ -29,7 +29,6 @@ class PillarboxAndroidLibraryTestedModulePlugin : Plugin<Project> {
                 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
             }
 
-            @Suppress("UnstableApiUsage")
             testOptions {
                 unitTests {
                     isIncludeAndroidResources = true

build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/internal/ProjectExtensions.kt

@@ -26,6 +26,7 @@ internal fun Project.configureAndroidModule(extension: CommonExtension<*, *, *,
     compileOptions {
         sourceCompatibility = AppConfig.javaVersion
         targetCompatibility = AppConfig.javaVersion
+        isCoreLibraryDesugaringEnabled = true
     }
 
     buildFeatures {

docs/README.md

@@ -81,10 +81,41 @@ repositories {
 gpr.user=<your_GitHub_username>
 gpr.key=<your_GitHub_personal_access_token>
 ```
-
 > [!TIP]
 > You can check the [GitHub documentation](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry#using-a-published-package) for more information.
 
+
+### Add the SRG SSR Maven repository
+
+Pillarbox is also deployed to the [SRG SSR Maven repository](https://nxrm.rts.ch/repository/maven-srgssr/). If you don't want to use the GitHub Packages repository, add the following to your Gradle configuration:
+
+> [!NOTE]
+> You only need to add either the GitHub Packages repository or the SRG SSR repository, not both.
+
+```kotlin
+// If you declare your repositories in the `settings.gradle(.kts)` file
+repositories {
+    maven("https://nxrm.rts.ch/repository/maven-srgssr/") {
+        credentials {
+            username = providers.gradleProperty("srg_maven_user").get()
+            password = providers.gradleProperty("srg_maven_password").get()
+        }
+    }
+}
+
+// If you declare your repositories in the root `build.gradle(.kts)` file
+repositories {
+    maven("https://nxrm.rts.ch/repository/maven-srgssr/") {
+        credentials {
+            username = project.findProperty("srg_maven_user")?.toString()
+            password = project.findProperty("srg_maven_password")?.toString()
+        }
+    }
+}
+```
+
+The necessary credentials can be found in the SRG SSR Bitwarden.
+
 ### Add the Pillarbox dependencies
 
 In your module's `build.gradle`/`build.gradle.kts` file, add the following dependencies, based on your needs:
@@ -123,6 +154,22 @@ kotlinOptions {
 }
 ```
 
+### Support Android API < 26
+
+If your min SDK version is below 26, you have to enable library desugaring as described in the [Android documentation](https://developer.android.com/studio/write/java8-support#library-desugaring):
+
+```kotlin
+android {
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+    }
+}
+
+dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+}
+```
+
 ### Integrate Pillarbox
 
 To start using Pillarbox in your project, you can check each module's documentation:

gradle/libs.versions.toml

@@ -1,37 +1,39 @@
 [versions]
-android-gradle-plugin = "8.9.2"
+android-gradle-plugin = "8.10.0"
 androidx-activity = "1.10.1"
 androidx-annotation = "1.9.1"
-androidx-compose = "2025.04.00"
+androidx-compose = "2025.05.01"
 androidx-core = "1.16.0"
-androidx-datastore = "1.1.4"
-androidx-lifecycle = "2.8.7"
-androidx-media3 = "1.6.1"
-androidx-mediarouter-compose = "0.3.0"
-androidx-navigation = "2.8.9"
+androidx-datastore = "1.1.7"
+androidx-lifecycle = "2.9.0"
+androidx-media3 = "1.7.1"
+androidx-navigation = "2.9.0"
 androidx-paging = "3.3.6"
 androidx-test-core = "1.6.1"
 androidx-test-ext-junit = "1.2.1"
 androidx-test-monitor = "1.7.2"
 androidx-tv-material = "1.0.0"
-coil = "3.1.0"
+coil = "3.2.0"
 comscore = "6.11.1"
-dependency-analysis-gradle-plugin = "2.16.0"
+dependency-analysis-gradle-plugin = "2.17.0"
+desugar_jdk_libs = "2.1.5"
 detekt = "1.23.8"
 dokka = "2.0.0"
 guava = "33.3.1-android"
-json = "20250107"
+json = "20250517"
 junit = "4.13.2"
-kotlin = "2.1.20"
+kotlin = "2.1.21"
 kotlinx-coroutines = "1.10.2"
 kotlinx-datetime = "0.6.2"
 kotlinx-kover = "0.9.1"
 kotlinx-serialization = "1.8.1"
-mockk = "1.14.0"
+media-maestro = "0.10.0"
+mockk = "1.14.2"
 okhttp = "4.12.0"
 okio = "3.11.0"
+reorderable = "2.4.3"
 robolectric = "4.14.1"
-srg-data-provider = "0.13.2"
+srg-data-provider = "0.15.1"
 tag-commander-core = "5.4.3"
 tag-commander-server-side = "5.5.2"
 turbine = "1.2.0"
@@ -51,7 +53,6 @@ androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime",
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
-androidx-mediarouter-compose = { module = "ch.srgssr.androidx.mediarouter:mediarouter-compose", version.ref = "androidx-mediarouter-compose" }
 androidx-navigation-common = { module = "androidx.navigation:navigation-common", version.ref = "androidx-navigation" }
 androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidx-navigation" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
@@ -66,6 +67,7 @@ coil-core = { group = "io.coil-kt.coil3", name = "coil-core", version.ref = "coi
 coil-network-cache-control = { group = "io.coil-kt.coil3", name = "coil-network-cache-control", version.ref = "coil" }
 coil-network-core = { group = "io.coil-kt.coil3", name = "coil-network-core", version.ref = "coil" }
 coil-network-okhttp = { group = "io.coil-kt.coil3", name = "coil-network-okhttp", version.ref = "coil" }
+desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
 dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 json = { module = "org.json:json", version.ref = "json" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -76,6 +78,8 @@ kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.
 kotlinx-kover-gradle = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kotlinx-kover" }
 kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
+media-maestro = { module = "ch.srgssr.media.maestro:media-maestro", version.ref = "media-maestro" }
+reorderable = { module = "sh.calvin.reorderable:reorderable", version.ref = "reorderable" }
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
 robolectric-annotations = { module = "org.robolectric:annotations", version.ref = "robolectric" }
 robolectric-shadows-framework = { module = "org.robolectric:shadows-framework", version.ref = "robolectric" }
@@ -124,7 +128,6 @@ androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text" }
 androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 androidx-compose-ui-unit = { module = "androidx.compose.ui:ui-unit" }
-androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" }
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-compose-material3-window-size = { module = "androidx.compose.material3:material3-window-size-class" }
 androidx-compose-material-icons-core = { module = "androidx.compose.material:material-icons-core" }