Update dependencies (readium#445)

marshal1919 · Jan 16, 2024 · cb9d2c0 · cb9d2c0
1 parent 54383a5
commit cb9d2c0
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 29 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 
-accompanist = "0.30.1"
+accompanist = "0.32.0"
 
 androidx-activity = "1.8.2"
 androidx-appcompat = "1.6.1"
@@ -22,41 +22,41 @@ androidx-expresso-core = "3.5.1"
 androidx-ext-junit = "1.1.5"
 androidx-fragment-ktx = "1.6.2"
 androidx-legacy = "1.0.0"
-androidx-lifecycle = "2.6.2"
+androidx-lifecycle = "2.7.0"
 androidx-lifecycle-extensions = "2.2.0"
 androidx-media = "1.7.0"
-androidx-media2 = "1.2.1"
-androidx-media3 = "1.1.0"
+androidx-media2 = "1.3.0"
+androidx-media3 = "1.2.0"
 androidx-navigation = "2.7.6"
 androidx-paging = "3.2.1"
 androidx-recyclerview = "1.3.2"
 androidx-room = "2.6.1"
 androidx-viewpager2 = "1.0.0"
 androidx-webkit = "1.9.0"
 
-assertj = "3.24.2"
+assertj = "3.25.1"
 
-dokka = "1.8.20"
+dokka = "1.9.10"
 
 google-exoplayer = "2.19.1"
 google-material = "1.11.0"
 
-joda-time = "2.12.5"
-jsoup = "1.16.1"
+joda-time = "2.12.6"
+jsoup = "1.17.2"
 junit = "4.13.2"
 
 kotlin = "1.9.22"
 kotlinx-coroutines = "1.7.3"
 kotlinx-coroutines-test = "1.7.3"
-kotlinx-serialization-json = "1.5.1"
+kotlinx-serialization-json = "1.6.2"
 
 pdfium = "1.8.2"
 pdf-viewer = "2.8.2"
 #noinspection GradleDependency
 picasso = "2.8"
 pspdfkit = "8.4.1"
 
-robolectric = "4.10.3"
+robolectric = "4.11.1"
 
 timber = "5.0.1"
 

diff --git a/...tors/media/tts/src/main/java/org/readium/navigator/media/tts/session/TtsSessionAdapter.kt b/...tors/media/tts/src/main/java/org/readium/navigator/media/tts/session/TtsSessionAdapter.kt
@@ -772,6 +772,10 @@ internal class TtsSessionAdapter<E : TtsEngine.Error>(
         streamVolumeManager.setMuted(muted)
     }
 
+    override fun setAudioAttributes(audioAttributes: AudioAttributes, handleAudioFocus: Boolean) {
+        audioFocusManager.setAudioAttributes(audioAttributes)
+    }
+
     private fun notifyListenersPlaybackChanged(
         previousPlaybackInfo: TtsPlayer.Playback,
         playbackInfo: TtsPlayer.Playback

diff --git a/...adium/r2/shared/publication/services/content/iterators/HtmlResourceContentIteratorTest.kt b/...adium/r2/shared/publication/services/content/iterators/HtmlResourceContentIteratorTest.kt
@@ -54,7 +54,7 @@ class HtmlResourceContentIteratorTest {
         TextElement(
             locator = locator(
                 progression = 0.0,
-                selector = "#pgepubid00498 > div.center",
+                selector = "html > body > section > div.center",
                 before = null,
                 highlight = "171"
             ),
@@ -63,7 +63,7 @@ class HtmlResourceContentIteratorTest {
                 Segment(
                     locator = locator(
                         progression = 0.0,
-                        selector = "#pgepubid00498 > div.center",
+                        selector = "html > body > section > div.center",
                         before = null,
                         highlight = "171"
                     ),
@@ -75,7 +75,7 @@ class HtmlResourceContentIteratorTest {
         TextElement(
             locator = locator(
                 progression = 0.2,
-                selector = "#pgepubid00498 > h3",
+                selector = "html > body > section > h3",
                 before = "171",
                 highlight = "INTRODUCTORY"
             ),
@@ -84,7 +84,7 @@ class HtmlResourceContentIteratorTest {
                 Segment(
                     locator = locator(
                         progression = 0.2,
-                        selector = "#pgepubid00498 > h3",
+                        selector = "html > body > section > h3",
                         before = "171",
                         highlight = "INTRODUCTORY"
                     ),
@@ -96,7 +96,7 @@ class HtmlResourceContentIteratorTest {
         TextElement(
             locator = locator(
                 progression = 0.4,
-                selector = "#pgepubid00498 > p:nth-child(3)",
+                selector = "html > body > section > p:nth-child(3)",
                 before = "171INTRODUCTORY",
                 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."
             ),
@@ -105,7 +105,7 @@ class HtmlResourceContentIteratorTest {
                 Segment(
                     locator = locator(
                         progression = 0.4,
-                        selector = "#pgepubid00498 > p:nth-child(3)",
+                        selector = "html > body > section > p:nth-child(3)",
                         before = "171INTRODUCTORY",
                         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."
                     ),
@@ -117,7 +117,7 @@ class HtmlResourceContentIteratorTest {
         TextElement(
             locator = locator(
                 progression = 0.6,
-                selector = "#pgepubid00498 > p:nth-child(4)",
+                selector = "html > body > section > p:nth-child(4)",
                 before = "ade off into the more modern types of short tales.",
                 highlight = "The child's natural literature. The world has lost certain secrets as the price of an advancing civilization."
             ),
@@ -126,7 +126,7 @@ class HtmlResourceContentIteratorTest {
                 Segment(
                     locator = locator(
                         progression = 0.6,
-                        selector = "#pgepubid00498 > p:nth-child(4)",
+                        selector = "html > body > section > p:nth-child(4)",
                         before = "ade off into the more modern types of short tales.",
                         highlight = "The child's natural literature. The world has lost certain secrets as the price of an advancing civilization."
                     ),
@@ -138,7 +138,7 @@ class HtmlResourceContentIteratorTest {
         TextElement(
             locator = locator(
                 progression = 0.8,
-                selector = "#pgepubid00498 > p:nth-child(5)",
+                selector = "html > body > section > p:nth-child(5)",
                 before = "secrets as the price of an advancing civilization.",
                 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."
             ),
@@ -147,7 +147,7 @@ class HtmlResourceContentIteratorTest {
                 Segment(
                     locator = locator(
                         progression = 0.8,
-                        selector = "#pgepubid00498 > p:nth-child(5)",
+                        selector = "html > body > section > p:nth-child(5)",
                         before = "secrets as the price of an advancing civilization.",
                         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."
                     ),
@@ -271,13 +271,13 @@ class HtmlResourceContentIteratorTest {
 
     @Test
     fun `starting from a CSS selector`() = runTest {
-        val iter = iterator(html, locator(selector = "#pgepubid00498 > p:nth-child(3)"))
+        val iter = iterator(html, locator(selector = "html > body > section > p:nth-child(3)"))
         assertEquals(elements.subList(2, elements.size), iter.elements())
     }
 
     @Test
     fun `calling previous() when starting from a CSS selector`() = runTest {
-        val iter = iterator(html, locator(selector = "#pgepubid00498 > p:nth-child(3)"))
+        val iter = iterator(html, locator(selector = "html > body > section > p:nth-child(3)"))
         assertTrue(iter.hasPrevious())
         assertEquals(elements[1], iter.previous())
     }
@@ -557,7 +557,7 @@ class HtmlResourceContentIteratorTest {
                 TextElement(
                     locator = locator(
                         progression = 2 / 3.0,
-                        selector = "#c06-li-0001 > aside",
+                        selector = "html > body > ol.decimal > li > aside",
                         before = "e just described is very much a waterfall process.\n                        \n                        ",
                         highlight = "Trailing text"
                     ),
@@ -566,7 +566,7 @@ class HtmlResourceContentIteratorTest {
                         Segment(
                             locator = locator(
                                 progression = 2 / 3.0,
-                                selector = "#c06-li-0001 > aside",
+                                selector = "html > body > ol.decimal > li > aside",
                                 before = "e just described is very much a waterfall process.\n                        ",
                                 highlight = "Trailing text"
                             ),

diff --git a/readium/shared/src/test/java/org/readium/r2/shared/util/resource/DirectoryContainerTest.kt b/readium/shared/src/test/java/org/readium/r2/shared/util/resource/DirectoryContainerTest.kt
@@ -115,8 +115,8 @@ class DirectoryContainerTest {
         runBlocking {
             // FIXME: Test media types
             Shadows.shadowOf(MimeTypeMap.getSingleton()).apply {
-                addExtensionMimeTypMapping("txt", "text/plain")
-                addExtensionMimeTypMapping("mp3", "audio/mpeg")
+                addExtensionMimeTypeMapping("txt", "text/plain")
+                addExtensionMimeTypeMapping("mp3", "audio/mpeg")
             }
 
             val entries = sut().entries

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -18,10 +18,10 @@ pluginManagement {
     // it to integrate Readium in submodules.
     // See https://github.com/readium/kotlin-toolkit/pull/97
     plugins {
-        id("com.android.application") version ("8.2.0")
-        id("com.android.library") version ("8.2.0")
+        id("com.android.application") version ("8.2.1")
+        id("com.android.library") version ("8.2.1")
         id("io.github.gradle-nexus.publish-plugin") version ("1.3.0")
-        id("org.jetbrains.dokka") version ("1.8.20")
+        id("org.jetbrains.dokka") version ("1.9.10")
         id("org.jetbrains.kotlin.android") version ("1.9.22")
         id("org.jetbrains.kotlin.plugin.serialization") version ("1.9.22")
         id("org.jlleitschuh.gradle.ktlint") version ("11.5.1")