Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #494

Merged
merged 3 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle_wrapper_validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
23 changes: 0 additions & 23 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
}
}
Expand Down
15 changes: 7 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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" }
Expand Down
1 change: 0 additions & 1 deletion pillarbox-player/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,4 @@ dependencies {
androidTestImplementation(libs.junit)
androidTestRuntimeOnly(libs.kotlinx.coroutines.android)
androidTestImplementation(libs.mockk)
androidTestImplementation(libs.mockk.android)
}
Loading