Skip to content

Commit cb9d2c0

Browse files
authored
Update dependencies (readium#445)
1 parent 54383a5 commit cb9d2c0

File tree

5 files changed

+33
-29
lines changed

5 files changed

+33
-29
lines changed

gradle/libs.versions.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22

3-
accompanist = "0.30.1"
3+
accompanist = "0.32.0"
44

55
androidx-activity = "1.8.2"
66
androidx-appcompat = "1.6.1"
@@ -22,41 +22,41 @@ androidx-expresso-core = "3.5.1"
2222
androidx-ext-junit = "1.1.5"
2323
androidx-fragment-ktx = "1.6.2"
2424
androidx-legacy = "1.0.0"
25-
androidx-lifecycle = "2.6.2"
25+
androidx-lifecycle = "2.7.0"
2626
androidx-lifecycle-extensions = "2.2.0"
2727
androidx-media = "1.7.0"
28-
androidx-media2 = "1.2.1"
29-
androidx-media3 = "1.1.0"
28+
androidx-media2 = "1.3.0"
29+
androidx-media3 = "1.2.0"
3030
androidx-navigation = "2.7.6"
3131
androidx-paging = "3.2.1"
3232
androidx-recyclerview = "1.3.2"
3333
androidx-room = "2.6.1"
3434
androidx-viewpager2 = "1.0.0"
3535
androidx-webkit = "1.9.0"
3636

37-
assertj = "3.24.2"
37+
assertj = "3.25.1"
3838

39-
dokka = "1.8.20"
39+
dokka = "1.9.10"
4040

4141
google-exoplayer = "2.19.1"
4242
google-material = "1.11.0"
4343

44-
joda-time = "2.12.5"
45-
jsoup = "1.16.1"
44+
joda-time = "2.12.6"
45+
jsoup = "1.17.2"
4646
junit = "4.13.2"
4747

4848
kotlin = "1.9.22"
4949
kotlinx-coroutines = "1.7.3"
5050
kotlinx-coroutines-test = "1.7.3"
51-
kotlinx-serialization-json = "1.5.1"
51+
kotlinx-serialization-json = "1.6.2"
5252

5353
pdfium = "1.8.2"
5454
pdf-viewer = "2.8.2"
5555
#noinspection GradleDependency
5656
picasso = "2.8"
5757
pspdfkit = "8.4.1"
5858

59-
robolectric = "4.10.3"
59+
robolectric = "4.11.1"
6060

6161
timber = "5.0.1"
6262

readium/navigators/media/tts/src/main/java/org/readium/navigator/media/tts/session/TtsSessionAdapter.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,10 @@ internal class TtsSessionAdapter<E : TtsEngine.Error>(
772772
streamVolumeManager.setMuted(muted)
773773
}
774774

775+
override fun setAudioAttributes(audioAttributes: AudioAttributes, handleAudioFocus: Boolean) {
776+
audioFocusManager.setAudioAttributes(audioAttributes)
777+
}
778+
775779
private fun notifyListenersPlaybackChanged(
776780
previousPlaybackInfo: TtsPlayer.Playback,
777781
playbackInfo: TtsPlayer.Playback

readium/shared/src/test/java/org/readium/r2/shared/publication/services/content/iterators/HtmlResourceContentIteratorTest.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class HtmlResourceContentIteratorTest {
5454
TextElement(
5555
locator = locator(
5656
progression = 0.0,
57-
selector = "#pgepubid00498 > div.center",
57+
selector = "html > body > section > div.center",
5858
before = null,
5959
highlight = "171"
6060
),
@@ -63,7 +63,7 @@ class HtmlResourceContentIteratorTest {
6363
Segment(
6464
locator = locator(
6565
progression = 0.0,
66-
selector = "#pgepubid00498 > div.center",
66+
selector = "html > body > section > div.center",
6767
before = null,
6868
highlight = "171"
6969
),
@@ -75,7 +75,7 @@ class HtmlResourceContentIteratorTest {
7575
TextElement(
7676
locator = locator(
7777
progression = 0.2,
78-
selector = "#pgepubid00498 > h3",
78+
selector = "html > body > section > h3",
7979
before = "171",
8080
highlight = "INTRODUCTORY"
8181
),
@@ -84,7 +84,7 @@ class HtmlResourceContentIteratorTest {
8484
Segment(
8585
locator = locator(
8686
progression = 0.2,
87-
selector = "#pgepubid00498 > h3",
87+
selector = "html > body > section > h3",
8888
before = "171",
8989
highlight = "INTRODUCTORY"
9090
),
@@ -96,7 +96,7 @@ class HtmlResourceContentIteratorTest {
9696
TextElement(
9797
locator = locator(
9898
progression = 0.4,
99-
selector = "#pgepubid00498 > p:nth-child(3)",
99+
selector = "html > body > section > p:nth-child(3)",
100100
before = "171INTRODUCTORY",
101101
highlight = "The difficulties of classification are very apparent here, and once more it must be noted that illustrative and practical purposes rather than logical ones are served by the arrangement adopted. The modern fanciful story is here placed next to the real folk story instead of after all the groups of folk products. The Hebrew stories at the beginning belong quite as well, perhaps even better, in Section V, while the stories at the end of Section VI shade off into the more modern types of short tales."
102102
),
@@ -105,7 +105,7 @@ class HtmlResourceContentIteratorTest {
105105
Segment(
106106
locator = locator(
107107
progression = 0.4,
108-
selector = "#pgepubid00498 > p:nth-child(3)",
108+
selector = "html > body > section > p:nth-child(3)",
109109
before = "171INTRODUCTORY",
110110
highlight = "The difficulties of classification are very apparent here, and once more it must be noted that illustrative and practical purposes rather than logical ones are served by the arrangement adopted. The modern fanciful story is here placed next to the real folk story instead of after all the groups of folk products. The Hebrew stories at the beginning belong quite as well, perhaps even better, in Section V, while the stories at the end of Section VI shade off into the more modern types of short tales."
111111
),
@@ -117,7 +117,7 @@ class HtmlResourceContentIteratorTest {
117117
TextElement(
118118
locator = locator(
119119
progression = 0.6,
120-
selector = "#pgepubid00498 > p:nth-child(4)",
120+
selector = "html > body > section > p:nth-child(4)",
121121
before = "ade off into the more modern types of short tales.",
122122
highlight = "The child's natural literature. The world has lost certain secrets as the price of an advancing civilization."
123123
),
@@ -126,7 +126,7 @@ class HtmlResourceContentIteratorTest {
126126
Segment(
127127
locator = locator(
128128
progression = 0.6,
129-
selector = "#pgepubid00498 > p:nth-child(4)",
129+
selector = "html > body > section > p:nth-child(4)",
130130
before = "ade off into the more modern types of short tales.",
131131
highlight = "The child's natural literature. The world has lost certain secrets as the price of an advancing civilization."
132132
),
@@ -138,7 +138,7 @@ class HtmlResourceContentIteratorTest {
138138
TextElement(
139139
locator = locator(
140140
progression = 0.8,
141-
selector = "#pgepubid00498 > p:nth-child(5)",
141+
selector = "html > body > section > p:nth-child(5)",
142142
before = "secrets as the price of an advancing civilization.",
143143
highlight = "Without discussing the limits of the culture-epoch theory of human development as a complete guide in education, it is clear that the young child passes through a period when his mind looks out upon the world in a manner analogous to that of the folk as expressed in their literature."
144144
),
@@ -147,7 +147,7 @@ class HtmlResourceContentIteratorTest {
147147
Segment(
148148
locator = locator(
149149
progression = 0.8,
150-
selector = "#pgepubid00498 > p:nth-child(5)",
150+
selector = "html > body > section > p:nth-child(5)",
151151
before = "secrets as the price of an advancing civilization.",
152152
highlight = "Without discussing the limits of the culture-epoch theory of human development as a complete guide in education, it is clear that the young child passes through a period when his mind looks out upon the world in a manner analogous to that of the folk as expressed in their literature."
153153
),
@@ -271,13 +271,13 @@ class HtmlResourceContentIteratorTest {
271271

272272
@Test
273273
fun `starting from a CSS selector`() = runTest {
274-
val iter = iterator(html, locator(selector = "#pgepubid00498 > p:nth-child(3)"))
274+
val iter = iterator(html, locator(selector = "html > body > section > p:nth-child(3)"))
275275
assertEquals(elements.subList(2, elements.size), iter.elements())
276276
}
277277

278278
@Test
279279
fun `calling previous() when starting from a CSS selector`() = runTest {
280-
val iter = iterator(html, locator(selector = "#pgepubid00498 > p:nth-child(3)"))
280+
val iter = iterator(html, locator(selector = "html > body > section > p:nth-child(3)"))
281281
assertTrue(iter.hasPrevious())
282282
assertEquals(elements[1], iter.previous())
283283
}
@@ -557,7 +557,7 @@ class HtmlResourceContentIteratorTest {
557557
TextElement(
558558
locator = locator(
559559
progression = 2 / 3.0,
560-
selector = "#c06-li-0001 > aside",
560+
selector = "html > body > ol.decimal > li > aside",
561561
before = "e just described is very much a waterfall process.\n \n ",
562562
highlight = "Trailing text"
563563
),
@@ -566,7 +566,7 @@ class HtmlResourceContentIteratorTest {
566566
Segment(
567567
locator = locator(
568568
progression = 2 / 3.0,
569-
selector = "#c06-li-0001 > aside",
569+
selector = "html > body > ol.decimal > li > aside",
570570
before = "e just described is very much a waterfall process.\n ",
571571
highlight = "Trailing text"
572572
),

readium/shared/src/test/java/org/readium/r2/shared/util/resource/DirectoryContainerTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ class DirectoryContainerTest {
115115
runBlocking {
116116
// FIXME: Test media types
117117
Shadows.shadowOf(MimeTypeMap.getSingleton()).apply {
118-
addExtensionMimeTypMapping("txt", "text/plain")
119-
addExtensionMimeTypMapping("mp3", "audio/mpeg")
118+
addExtensionMimeTypeMapping("txt", "text/plain")
119+
addExtensionMimeTypeMapping("mp3", "audio/mpeg")
120120
}
121121

122122
val entries = sut().entries

settings.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ pluginManagement {
1818
// it to integrate Readium in submodules.
1919
// See https://github.com/readium/kotlin-toolkit/pull/97
2020
plugins {
21-
id("com.android.application") version ("8.2.0")
22-
id("com.android.library") version ("8.2.0")
21+
id("com.android.application") version ("8.2.1")
22+
id("com.android.library") version ("8.2.1")
2323
id("io.github.gradle-nexus.publish-plugin") version ("1.3.0")
24-
id("org.jetbrains.dokka") version ("1.8.20")
24+
id("org.jetbrains.dokka") version ("1.9.10")
2525
id("org.jetbrains.kotlin.android") version ("1.9.22")
2626
id("org.jetbrains.kotlin.plugin.serialization") version ("1.9.22")
2727
id("org.jlleitschuh.gradle.ktlint") version ("11.5.1")

0 commit comments

Comments
 (0)