Skip to content

Commit 717cfd0

Browse files
stevenzeckstevenzeck
authored
Dependency updates (#576)
1 parent 885d6e5 commit 717cfd0

File tree

20 files changed

+51
-123
lines changed

20 files changed

+51
-123
lines changed

‎.github/workflows/checks.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
if: ${{ !github.event.pull_request.draft }}
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
- name: Set up JDK 17
18-
uses: actions/setup-java@v3
18+
uses: actions/setup-java@v4
1919
with:
2020
java-version: '17'
2121
distribution: 'adopt'
@@ -30,9 +30,9 @@ jobs:
3030
if: ${{ !github.event.pull_request.draft }}
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434
- name: Set up JDK 17
35-
uses: actions/setup-java@v3
35+
uses: actions/setup-java@v4
3636
with:
3737
java-version: '17'
3838
distribution: 'adopt'
@@ -47,14 +47,14 @@ jobs:
4747
scripts: ${{ 'readium/navigator/src/main/assets/_scripts' }}
4848
steps:
4949
- name: Checkout
50-
uses: actions/checkout@v3
50+
uses: actions/checkout@v4
5151
- name: Install pnpm
52-
uses: pnpm/action-setup@v2
52+
uses: pnpm/action-setup@v4
5353
with:
5454
package_json_file: readium/navigator/src/main/assets/_scripts/package.json
5555
run_install: false
5656
- name: Setup cache
57-
uses: actions/setup-node@v3
57+
uses: actions/setup-node@v4
5858
with:
5959
node-version: 20
6060
cache: 'pnpm'

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
## Minimum Requirements
1010

11-
| Readium | Android min SDK | Android compile SDK | Kotlin compiler (✻) | Gradle (✻) |
12-
|---------|-----------------|---------------------|---------------------|------------|
13-
| 3.0.0 | 21 | 34 | 1.9.24 | 8.6.0 |
14-
| 2.3.0 | 21 | 33 | 1.7.10 | 6.9.3 |
11+
| Readium | Android min SDK | Android compile SDK | Kotlin compiler (✻) | Gradle (✻) |
12+
|-----------|-----------------|---------------------|---------------------|------------|
13+
| `develop` | 21 | 34 | 1.9.24 | 8.10.2 |
14+
| 3.0.0 | 21 | 34 | 1.9.24 | 8.6.0 |
15+
| 2.3.0 | 21 | 33 | 1.7.10 | 6.9.3 |
1516

1617
✻ Only required if you integrate Readium as a submodule instead of using Maven Central.
1718

‎gradle/libs.versions.toml‎

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,54 @@
11
[versions]
22

33
kotlin = "1.9.24"
4-
agp = "8.4.0"
4+
agp = "8.7.2"
55
desugar_jdk_libs = "2.0.4"
66
gradle-maven-publish-plugin = "0.28.0"
77

8-
androidx-activity = "1.9.0"
9-
androidx-appcompat = "1.6.1"
8+
androidx-activity = "1.9.3"
9+
androidx-annotation = "1.9.1"
10+
androidx-appcompat = "1.7.0"
1011
androidx-browser = "1.8.0"
1112
androidx-cardview = "1.0.0"
1213
# Make sure to align with the Kotlin version
1314
# https://developer.android.com/jetpack/androidx/releases/compose-kotlin
1415
androidx-compose-compiler = "1.5.14"
15-
androidx-compose-animation = "1.6.7"
16-
androidx-compose-foundation = "1.6.7"
17-
androidx-compose-material = "1.6.7"
18-
androidx-compose-material3 = "1.2.1"
19-
androidx-compose-runtime = "1.6.7"
20-
androidx-compose-ui = "1.6.7"
21-
androidx-constraintlayout = "2.1.4"
16+
androidx-compose-animation = "1.7.5"
17+
androidx-compose-foundation = "1.7.5"
18+
androidx-compose-material = "1.7.5"
19+
androidx-compose-material3 = "1.3.1"
20+
androidx-compose-runtime = "1.7.5"
21+
androidx-compose-ui = "1.7.5"
22+
androidx-constraintlayout = "2.2.0"
2223
androidx-core = "1.13.1"
2324
androidx-datastore = "1.1.1"
24-
androidx-expresso-core = "3.5.1"
25-
androidx-ext-junit = "1.1.5"
26-
androidx-fragment-ktx = "1.7.1"
25+
androidx-fragment-ktx = "1.8.5"
2726
androidx-legacy = "1.0.0"
28-
androidx-lifecycle = "2.8.0"
29-
androidx-lifecycle-extensions = "2.2.0"
27+
androidx-lifecycle = "2.8.7"
3028
androidx-media = "1.7.0"
3129
androidx-media2 = "1.3.0"
32-
androidx-media3 = "1.3.1"
33-
androidx-navigation = "2.7.7"
34-
androidx-paging = "3.3.0"
30+
androidx-media3 = "1.4.1"
31+
androidx-navigation = "2.8.3"
32+
androidx-paging = "3.3.2"
3533
androidx-recyclerview = "1.3.2"
3634
androidx-room = "2.6.1"
3735
androidx-viewpager2 = "1.1.0"
38-
androidx-webkit = "1.11.0"
36+
androidx-webkit = "1.12.1"
3937

40-
assertj = "3.25.3"
38+
assertj = "3.26.3"
4139

4240
dokka = "1.9.20"
4341

4442
google-exoplayer = "2.19.1"
4543
google-material = "1.12.0"
4644

47-
joda-time = "2.12.7"
48-
jsoup = "1.17.2"
45+
joda-time = "2.13.0"
46+
jsoup = "1.18.1"
4947
junit = "4.13.2"
5048

51-
kotlinx-coroutines = "1.8.1"
52-
kotlinx-coroutines-test = "1.8.1"
53-
kotlinx-datetime = "0.6.0"
49+
kotlinx-coroutines = "1.9.0"
50+
kotlinx-coroutines-test = "1.9.0"
51+
kotlinx-datetime = "0.6.1"
5452
kotlinx-serialization-json = "1.6.3"
5553

5654
# Make sure to align with the Kotlin version.
@@ -68,14 +66,15 @@ pdf-viewer = "2.8.2"
6866
picasso = "2.8"
6967
pspdfkit = "8.4.1"
7068

71-
robolectric = "4.12.2"
69+
robolectric = "4.13"
7270

7371
timber = "5.0.1"
7472

7573

7674
[libraries]
7775

7876
androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidx-activity" }
77+
androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidx-annotation" }
7978
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" }
8079
androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidx-browser" }
8180
androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "androidx-cardview" }
@@ -91,18 +90,9 @@ androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-toolin
9190
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
9291
androidx-core = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core" }
9392
androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidx-datastore" }
94-
androidx-expresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-expresso-core" }
95-
androidx-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-ext-junit" }
9693
androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidx-fragment-ktx" }
97-
androidx-legacy-v4 = { group = "androidx.legacy", name = "legacy-support-v4", version.ref = "androidx-legacy" }
9894
androidx-legacy-ui = { group = "androidx.legacy", name = "legacy-support-core-ui", version.ref = "androidx-legacy" }
9995
androidx-lifecycle-common = { group = "androidx.lifecycle", name = "lifecycle-common-java8", version.ref = "androidx-lifecycle" }
100-
androidx-lifecycle-extensions = { group = "androidx.lifecycle", name = "lifecycle-extensions", version.ref = "androidx-lifecycle-extensions" }
101-
androidx-lifecycle-livedata = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" }
102-
androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
103-
androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
104-
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
105-
androidx-lifecycle-vmsavedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" }
10696
androidx-media = { group = "androidx.media", name = "media", version.ref = "androidx-media" }
10797
androidx-media2-session = { group = "androidx.media2", name = "media2-session", version.ref = "androidx-media2" }
10898
androidx-media2-player = { group = "androidx.media2", name = "media2-player", version.ref = "androidx-media2" }
@@ -165,7 +155,6 @@ ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
165155

166156
compose = ["androidx-compose-activity", "androidx-compose-animation", "androidx-compose-foundation", "androidx-compose-material", "androidx-compose-material3", "androidx-compose-material-icons", "androidx-compose-runtime", "androidx-compose-ui", "androidx-compose-ui-tooling"]
167157
exoplayer = ["google-exoplayer-core", "google-exoplayer-ui", "google-exoplayer-mediasession", "google-exoplayer-workmanager", "google-exoplayer-extension-media2"]
168-
lifecycle = ["androidx-lifecycle-common", "androidx-lifecycle-extensions", "androidx-lifecycle-livedata", "androidx-lifecycle-runtime", "androidx-lifecycle-viewmodel", "androidx-lifecycle-vmsavedstate", "androidx-lifecycle-viewmodel-compose"]
169158
media2 = ["androidx-media2-session", "androidx-media2-player", "google-exoplayer-core", "google-exoplayer-extension-media2"]
170159
media3 = ["androidx-media3-session", "androidx-media3-common", "androidx-media3-exoplayer"]
171160
room = ["androidx-room-runtime", "androidx-room-ktx"]

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎readium/adapters/exoplayer/audio/src/main/java/org/readium/adapter/exoplayer/audio/ExoPlayerEngine.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ public class ExoPlayerEngine private constructor(
120120

121121
private suspend fun prepareExoPlayer(player: ExoPlayer) {
122122
lateinit var listener: Player.Listener
123-
suspendCancellableCoroutine { continuation ->
123+
suspendCancellableCoroutine<Unit> { continuation ->
124124
listener = object : Player.Listener {
125125
override fun onPlaybackStateChanged(playbackState: Int) {
126126
when (playbackState) {
127-
Player.STATE_READY -> continuation.resume(Unit) {}
127+
Player.STATE_READY -> continuation.resume(Unit) { _, _, _ -> }
128128
Player.STATE_IDLE -> if (player.playerError != null) {
129-
continuation.resume(Unit) {}
129+
continuation.resume(Unit) { _, _, _ -> }
130130
}
131131
else -> {}
132132
}

‎readium/adapters/pdfium/document/build.gradle.kts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@ android {
1515
dependencies {
1616
api(project(":readium:readium-shared"))
1717

18-
implementation(libs.androidx.core)
1918
implementation(libs.pdfium)
2019
implementation(libs.timber)
2120
implementation(libs.kotlinx.coroutines.android)
22-
23-
testImplementation(libs.junit)
24-
25-
androidTestImplementation(libs.androidx.ext.junit)
26-
androidTestImplementation(libs.androidx.expresso.core)
2721
}

‎readium/adapters/pdfium/navigator/build.gradle.kts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,4 @@ dependencies {
2828
implementation(libs.timber)
2929
implementation(libs.kotlinx.coroutines.android)
3030
implementation(libs.kotlinx.serialization.json)
31-
32-
testImplementation(libs.junit)
33-
34-
androidTestImplementation(libs.androidx.ext.junit)
35-
androidTestImplementation(libs.androidx.expresso.core)
3631
}

‎readium/adapters/pspdfkit/document/build.gradle.kts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@ android {
1515
dependencies {
1616
api(project(":readium:readium-shared"))
1717

18-
implementation(libs.androidx.core)
1918
implementation(libs.timber)
2019
implementation(libs.pspdfkit)
2120
implementation(libs.kotlinx.coroutines.android)
22-
23-
testImplementation(libs.junit)
24-
25-
androidTestImplementation(libs.androidx.ext.junit)
26-
androidTestImplementation(libs.androidx.expresso.core)
2721
}

‎readium/adapters/pspdfkit/navigator/build.gradle.kts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,4 @@ dependencies {
2626
implementation(libs.pspdfkit)
2727
implementation(libs.kotlinx.coroutines.android)
2828
implementation(libs.kotlinx.serialization.json)
29-
30-
testImplementation(libs.junit)
31-
32-
androidTestImplementation(libs.androidx.ext.junit)
33-
androidTestImplementation(libs.androidx.expresso.core)
3429
}

‎readium/lcp/build.gradle.kts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,4 @@ dependencies {
3737
// Tests
3838
testImplementation(libs.junit)
3939
testImplementation(libs.kotlin.junit)
40-
41-
androidTestImplementation(libs.androidx.ext.junit)
42-
androidTestImplementation(libs.androidx.expresso.core)
4340
}

0 commit comments

Comments
 (0)