From 8d5882848db7dfe845e37df44565582d695f395d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Mon, 15 Apr 2024 16:15:21 +0200 Subject: [PATCH] Update dependencies (#494) --- .github/workflows/build.yml | 8 ++----- .../workflows/gradle_wrapper_validation.yml | 2 +- build.gradle.kts | 23 ------------------- gradle/libs.versions.toml | 15 ++++++------ pillarbox-player/build.gradle.kts | 1 - 5 files changed, 10 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad9c913fa..f02703845 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,13 +109,9 @@ jobs: run: mkdir -p ~/.gradle; cp .github/gradle-ci.properties ~/.gradle/gradle.properties - name: Run Dependency Analysis run: ./gradlew buildHealth - - name: Archive analysis report - uses: actions/upload-artifact@v4 + - name: Display analysis report if: failure() - with: - name: dependency-analysis-report - path: build/reports/dependency-analysis/build-health-report.txt - overwrite: true + run: cat build/reports/dependency-analysis/build-health-report.txt unit-test: name: Unit Tests diff --git a/.github/workflows/gradle_wrapper_validation.yml b/.github/workflows/gradle_wrapper_validation.yml index 495548b07..c5761722e 100644 --- a/.github/workflows/gradle_wrapper_validation.yml +++ b/.github/workflows/gradle_wrapper_validation.yml @@ -17,4 +17,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v2 + - uses: gradle/actions/wrapper-validation@v3 diff --git a/build.gradle.kts b/build.gradle.kts index 7e345beb3..dc2ac0db4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -101,33 +101,10 @@ dependencyAnalysis { } } - project(":pillarbox-demo") { - onUnusedDependencies { - // This dependency is not used directly, but required to have previews in Android Studio - exclude(libs.androidx.compose.ui.tooling.asProvider()) - } - } - - project(":pillarbox-demo-tv") { - onUnusedDependencies { - // This dependency is not used directly, but required to have previews in Android Studio - exclude(libs.androidx.compose.ui.tooling.asProvider()) - } - } - project(":pillarbox-player") { onUnusedDependencies { // These dependencies are not used directly, but automatically used by libs.androidx.media3.exoplayer exclude(libs.androidx.media3.dash, libs.androidx.media3.hls) - // This dependency is used automatically by libs.mockk - exclude(libs.mockk.android) - } - } - - project(":pillarbox-ui") { - onUnusedDependencies { - // This dependency is not used directly, but required to have previews in Android Studio - exclude(libs.androidx.compose.ui.tooling.asProvider()) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52a77921d..9f6a0ff8c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,15 +1,15 @@ [versions] accompanist = "0.34.0" -android-gradle-plugin = "8.3.1" +android-gradle-plugin = "8.3.2" androidx-activity = "1.8.2" androidx-annotation = "1.7.1" -androidx-compose = "2024.03.00" +androidx-compose = "2024.04.00" androidx-core = "1.12.0" androidx-fragment = "1.6.2" androidx-leanback = "1.0.0" androidx-lifecycle = "2.7.0" androidx-media = "1.7.0" -androidx-media3 = "1.3.0" +androidx-media3 = "1.3.1" androidx-navigation = "2.7.7" androidx-paging = "3.2.1" androidx-test-core = "1.5.0" @@ -18,8 +18,8 @@ androidx-test-monitor = "1.6.1" androidx-test-runner = "1.5.2" androidx-tv = "1.0.0-alpha10" coil = "2.6.0" -comscore = "6.10.0" -dependency-analysis-gradle-plugin = "1.30.0" +comscore = "6.11.1" +dependency-analysis-gradle-plugin = "1.31.0" detekt = "1.23.6" guava = "32.1.3-android" json = "20240303" @@ -28,11 +28,11 @@ kotlin = "1.9.23" kotlinx-coroutines = "1.8.0" kotlinx-kover = "0.7.6" kotlinx-serialization = "1.6.3" -ktor = "2.3.9" +ktor = "2.3.10" mockk = "1.13.10" okhttp = "4.12.0" robolectric = "4.12.1" -srg-data-provider = "0.8.2" +srg-data-provider = "0.9.0" tag-commander-core = "5.4.4" tag-commander-server-side = "5.5.3" turbine = "1.1.0" @@ -89,7 +89,6 @@ detekt-cli = { group = "io.gitlab.arturbosch.detekt", name = "detekt-cli", versi detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" } junit = { group = "junit", name = "junit", version.ref = "junit" } mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" } -mockk-android = { group = "io.mockk", name = "mockk-android", version.ref = "mockk" } mockk-dsl = { group = "io.mockk", name = "mockk-dsl-jvm", version.ref = "mockk" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } diff --git a/pillarbox-player/build.gradle.kts b/pillarbox-player/build.gradle.kts index ec29366e5..8968c7773 100644 --- a/pillarbox-player/build.gradle.kts +++ b/pillarbox-player/build.gradle.kts @@ -62,5 +62,4 @@ dependencies { androidTestImplementation(libs.junit) androidTestRuntimeOnly(libs.kotlinx.coroutines.android) androidTestImplementation(libs.mockk) - androidTestImplementation(libs.mockk.android) }