Skip to content

Commit

Permalink
Update dependencies (#453)
Browse files Browse the repository at this point in the history
  • Loading branch information
MGaetan89 authored Mar 5, 2024
1 parent d72c345 commit c141f24
Show file tree
Hide file tree
Showing 28 changed files with 651 additions and 2,118 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
with:
java-version: '17'
distribution: 'temurin'
- uses: gradle/wrapper-validation-action@v1
- uses: gradle/wrapper-validation-action@v2
- uses: gradle/actions/setup-gradle@v3
with:
cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
VERSION_NAME: ${{ github.ref_name }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check if pre release tag
id: check-tag
run: |
Expand All @@ -27,7 +27,7 @@ jobs:
echo "tag = ${GITHUB_REF_NAME}"
echo "version_name = ${VERSION_NAME}"
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
Expand Down
23 changes: 0 additions & 23 deletions .idea/kotlinScripting.xml

This file was deleted.

21 changes: 21 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,20 @@ 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
Expand All @@ -109,5 +123,12 @@ dependencyAnalysis {
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())
}
}
}
}
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[versions]
accompanist = "0.34.0"
android-gradle-plugin = "8.2.2"
android-gradle-plugin = "8.3.0"
androidx-activity = "1.8.2"
androidx-annotation = "1.7.1"
androidx-compose = "2024.02.00"
androidx-compose = "2024.02.01"
# https://developer.android.com/jetpack/androidx/releases/compose-kotlin
androidx-compose-compiler = "1.5.9"
androidx-compose-compiler = "1.5.10"
androidx-core = "1.12.0"
androidx-fragment = "1.6.2"
androidx-leanback = "1.0.0"
Expand All @@ -21,20 +21,20 @@ androidx-test-runner = "1.5.2"
androidx-tv = "1.0.0-alpha10"
coil = "2.5.0"
comscore = "6.10.0"
dependency-analysis-gradle-plugin = "1.29.0"
dependency-analysis-gradle-plugin = "1.30.0"
detekt = "1.23.5"
guava = "31.1-android"
json = "20231013"
json = "20240205"
junit = "4.13.2"
kotlin = "1.9.22"
kotlinx-coroutines = "1.8.0"
kotlinx-kover = "0.7.6"
kotlinx-serialization = "1.6.2"
ktor = "2.3.8"
mockk = "1.13.9"
kotlinx-serialization = "1.6.3"
ktor = "2.3.9"
mockk = "1.13.10"
okhttp = "4.12.0"
robolectric = "4.11.1"
srg-data-provider = "0.8.0"
srg-data-provider = "0.8.2"
tag-commander-core = "5.4.3"
tag-commander-server-side = "5.5.2"
turbine = "1.0.0"
Expand Down
10 changes: 1 addition & 9 deletions pillarbox-core-business/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,7 @@ dependencies {
testImplementation(libs.mockk.dsl)
testRuntimeOnly(libs.robolectric)
testImplementation(libs.robolectric.annotations)
testRuntimeOnly(libs.robolectric.shadows.framework)

androidTestImplementation(project(":pillarbox-player-testutils"))

androidTestImplementation(libs.androidx.test.monitor)
androidTestImplementation(libs.androidx.test.runner)
androidTestImplementation(libs.junit)
androidTestRuntimeOnly(libs.kotlinx.coroutines.android)
androidTestImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.robolectric.shadows.framework)
}

koverReport {
Expand Down
Loading

0 comments on commit c141f24

Please sign in to comment.