Bump dependencies

README.md

@@ -10,7 +10,7 @@
 
 | Readium | Android min SDK | Android compile SDK | Kotlin compiler (✻) | Gradle (✻) |
 |---------|-----------------|---------------------|---------------------|------------|
-| 3.0.0   | 21              | 34                  | 1.9.22              | 8.2.2      |
+| 3.0.0   | 21              | 34                  | 1.9.24              | 8.6.0      |
 | 2.3.0   | 21              | 33                  | 1.7.10              | 6.9.3      |
 
 ✻ Only required if you integrate Readium as a submodule instead of using Maven Central.

buildSrc/src/main/kotlin/readium.library-conventions.gradle.kts

@@ -29,10 +29,6 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
         allWarningsAsErrors = true
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=kotlin.RequiresOptIn",
-            "-opt-in=org.readium.r2.shared.InternalReadiumApi"
-        )
     }
 
     testOptions {

gradle/libs.versions.toml

@@ -1,73 +1,74 @@
 [versions]
 
-kotlin = "1.9.22"
-agp = "8.2.2"
+kotlin = "1.9.24"
+agp = "8.4.0"
 desugar_jdk_libs = "2.0.4"
-gradle-maven-publish-plugin = "0.27.0"
+gradle-maven-publish-plugin = "0.28.0"
 
-accompanist = "0.34.0"
-
-androidx-activity = "1.8.2"
+androidx-activity = "1.9.0"
 androidx-appcompat = "1.6.1"
-androidx-browser = "1.7.0"
+androidx-browser = "1.8.0"
 androidx-cardview = "1.0.0"
 # Make sure to align with the Kotlin version
 # https://developer.android.com/jetpack/androidx/releases/compose-kotlin
-androidx-compose-compiler = "1.5.8"
-androidx-compose-animation = "1.6.0"
-androidx-compose-foundation = "1.6.0"
-androidx-compose-material = "1.6.0"
-androidx-compose-material3 = "1.1.2"
-androidx-compose-runtime = "1.6.0"
-androidx-compose-ui = "1.6.0"
+androidx-compose-compiler = "1.5.14"
+androidx-compose-animation = "1.6.7"
+androidx-compose-foundation = "1.6.7"
+androidx-compose-material = "1.6.7"
+androidx-compose-material3 = "1.2.1"
+androidx-compose-runtime = "1.6.7"
+androidx-compose-ui = "1.6.7"
 androidx-constraintlayout = "2.1.4"
-androidx-core = "1.12.0"
-androidx-datastore = "1.0.0"
+androidx-core = "1.13.1"
+androidx-datastore = "1.1.1"
 androidx-expresso-core = "3.5.1"
 androidx-ext-junit = "1.1.5"
-androidx-fragment-ktx = "1.6.2"
+androidx-fragment-ktx = "1.7.1"
 androidx-legacy = "1.0.0"
-androidx-lifecycle = "2.7.0"
+androidx-lifecycle = "2.8.0"
 androidx-lifecycle-extensions = "2.2.0"
 androidx-media = "1.7.0"
 androidx-media2 = "1.3.0"
-androidx-media3 = "1.3.0"
-androidx-navigation = "2.7.6"
-androidx-paging = "3.2.1"
+androidx-media3 = "1.3.1"
+androidx-navigation = "2.7.7"
+androidx-paging = "3.3.0"
 androidx-recyclerview = "1.3.2"
 androidx-room = "2.6.1"
-androidx-viewpager2 = "1.0.0"
-androidx-webkit = "1.10.0"
+androidx-viewpager2 = "1.1.0"
+androidx-webkit = "1.11.0"
 
-assertj = "3.25.2"
+assertj = "3.25.3"
 
-dokka = "1.9.10"
+dokka = "1.9.20"
 
 google-exoplayer = "2.19.1"
-google-material = "1.11.0"
+google-material = "1.12.0"
 
-joda-time = "2.12.6"
+joda-time = "2.12.7"
 jsoup = "1.17.2"
 junit = "4.13.2"
 
-kotlinx-coroutines = "1.7.3"
-kotlinx-coroutines-test = "1.7.3"
-kotlinx-datetime = "0.6.0-RC.2"
-kotlinx-serialization-json = "1.6.2"
+kotlinx-coroutines = "1.8.1"
+kotlinx-coroutines-test = "1.8.1"
+kotlinx-datetime = "0.6.0"
+kotlinx-serialization-json = "1.6.3"
 
 # Make sure to align with the Kotlin version.
 # See https://github.com/google/ksp/releases
-ksp = "1.9.22-1.0.16"
+ksp = "1.9.24-1.0.20"
 
 ktlint = "11.5.1"
 
+# We cannot upgrade to 1.9.0 as it conflicts with liblcp.
+# See https://github.com/readium/kotlin-toolkit/issues/29
+#noinspection GradleDependency
 pdfium = "1.8.2"
 pdf-viewer = "2.8.2"
 #noinspection GradleDependency
 picasso = "2.8"
 pspdfkit = "8.4.1"
 
-robolectric = "4.11.1"
+robolectric = "4.12.2"
 
 timber = "5.0.1"
 
@@ -168,6 +169,4 @@ exoplayer = ["google-exoplayer-core", "google-exoplayer-ui", "google-exoplayer-m
 lifecycle = ["androidx-lifecycle-common", "androidx-lifecycle-extensions", "androidx-lifecycle-livedata", "androidx-lifecycle-runtime", "androidx-lifecycle-viewmodel", "androidx-lifecycle-vmsavedstate", "androidx-lifecycle-viewmodel-compose"]
 media2 = ["androidx-media2-session", "androidx-media2-player", "google-exoplayer-core", "google-exoplayer-extension-media2"]
 media3 = ["androidx-media3-session", "androidx-media3-common", "androidx-media3-exoplayer"]
-navigation = ["androidx-navigation-fragment", "androidx-navigation-ui"]
 room = ["androidx-room-runtime", "androidx-room-ktx"]
-test-frameworks = ["junit", "androidx-ext-junit", "androidx-expresso-core", "robolectric", "kotlin-junit", "assertj", "kotlinx-coroutines-test"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -4,6 +4,8 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.adapter.exoplayer.audio
 
 import android.app.Application
@@ -15,6 +17,7 @@ import org.readium.navigator.media.common.DefaultMediaMetadataProvider
 import org.readium.navigator.media.common.MediaMetadataProvider
 import org.readium.r2.navigator.extensions.time
 import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.publication.Locator
 import org.readium.r2.shared.publication.Publication
 import org.readium.r2.shared.publication.indexOfFirstWithHref

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

@@ -4,6 +4,8 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.adapter.exoplayer.audio
 
 import org.readium.r2.navigator.extensions.format
@@ -12,6 +14,7 @@ import org.readium.r2.navigator.preferences.PreferencesEditor
 import org.readium.r2.navigator.preferences.RangePreference
 import org.readium.r2.navigator.preferences.RangePreferenceDelegate
 import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.publication.Metadata
 
 /**

readium/adapters/pdfium/document/src/main/java/org/readium/adapter/pdfium/document/PdfiumDocument.kt

@@ -4,6 +4,8 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.adapter.pdfium.document
 
 import android.content.Context

readium/adapters/pdfium/navigator/src/main/java/org/readium/adapter/pdfium/navigator/PdfiumDocumentFragment.kt

@@ -4,6 +4,8 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.adapter.pdfium.navigator
 
 import android.graphics.PointF
@@ -23,6 +25,7 @@ import org.readium.r2.navigator.preferences.Axis
 import org.readium.r2.navigator.preferences.Fit
 import org.readium.r2.navigator.preferences.ReadingProgression
 import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.publication.LocalizedString
 import org.readium.r2.shared.publication.Manifest
 import org.readium.r2.shared.publication.Metadata

readium/adapters/pdfium/navigator/src/main/java/org/readium/adapter/pdfium/navigator/PdfiumEngineProvider.kt

@@ -4,6 +4,8 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.adapter.pdfium.navigator
 
 import android.graphics.PointF
@@ -16,6 +18,7 @@ import org.readium.r2.navigator.pdf.PdfEngineProvider
 import org.readium.r2.navigator.util.SingleFragmentFactory
 import org.readium.r2.navigator.util.createFragmentFactory
 import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.publication.Metadata
 import org.readium.r2.shared.publication.Publication
 import org.readium.r2.shared.util.Url

readium/adapters/pdfium/navigator/src/main/java/org/readium/adapter/pdfium/navigator/PdfiumPreferencesEditor.kt

@@ -4,11 +4,14 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.adapter.pdfium.navigator
 
 import org.readium.r2.navigator.extensions.format
 import org.readium.r2.navigator.preferences.*
 import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.publication.Metadata
 
 /**

readium/adapters/pspdfkit/navigator/src/main/java/org/readium/adapter/pspdfkit/navigator/PsPdfKitDocumentFragment.kt

@@ -4,6 +4,8 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.adapter.pspdfkit.navigator
 
 import android.graphics.PointF
@@ -51,6 +53,7 @@ import org.readium.r2.navigator.preferences.ReadingProgression
 import org.readium.r2.navigator.preferences.Spread
 import org.readium.r2.navigator.util.createViewModelFactory
 import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.publication.Publication
 import org.readium.r2.shared.publication.services.isProtected
 import org.readium.r2.shared.util.Url

readium/adapters/pspdfkit/navigator/src/main/java/org/readium/adapter/pspdfkit/navigator/PsPdfKitEngineProvider.kt

@@ -4,6 +4,8 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.adapter.pspdfkit.navigator
 
 import android.graphics.PointF
@@ -17,6 +19,7 @@ import org.readium.r2.navigator.preferences.Axis
 import org.readium.r2.navigator.util.SingleFragmentFactory
 import org.readium.r2.navigator.util.createFragmentFactory
 import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.publication.Metadata
 import org.readium.r2.shared.publication.Publication
 import org.readium.r2.shared.util.Url

readium/adapters/pspdfkit/navigator/src/main/java/org/readium/adapter/pspdfkit/navigator/PsPdfKitPreferencesEditor.kt

@@ -4,6 +4,8 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.adapter.pspdfkit.navigator
 
 import org.readium.r2.navigator.extensions.format
@@ -20,6 +22,7 @@ import org.readium.r2.navigator.preferences.RangePreferenceDelegate
 import org.readium.r2.navigator.preferences.ReadingProgression
 import org.readium.r2.navigator.preferences.Spread
 import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.publication.Metadata
 
 /**

readium/lcp/src/main/java/org/readium/r2/lcp/LcpContentProtection.kt

@@ -4,10 +4,13 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.r2.lcp
 
 import org.readium.r2.lcp.auth.LcpPassphraseAuthentication
 import org.readium.r2.lcp.license.model.LicenseDocument
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.publication.encryption.Encryption
 import org.readium.r2.shared.publication.encryption.encryption
 import org.readium.r2.shared.publication.epub.EpubEncryptionParser

readium/lcp/src/main/java/org/readium/r2/lcp/LcpDecryptor.kt

@@ -7,8 +7,11 @@
  * LICENSE file present in the project repository where this source code is maintained.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.r2.lcp
 
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.extensions.coerceFirstNonNegative
 import org.readium.r2.shared.extensions.inflate
 import org.readium.r2.shared.extensions.requireLengthFitInt

readium/lcp/src/main/java/org/readium/r2/lcp/LcpDecryptorTest.kt

@@ -8,10 +8,12 @@
  */
 
 @file:Suppress("unused")
+@file:OptIn(InternalReadiumApi::class)
 
 package org.readium.r2.lcp
 
 import kotlin.math.ceil
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.extensions.coerceIn
 import org.readium.r2.shared.publication.Publication
 import org.readium.r2.shared.util.ErrorException

readium/lcp/src/main/java/org/readium/r2/lcp/auth/LcpDialogAuthentication.kt

@@ -4,6 +4,8 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.r2.lcp.auth
 
 import android.annotation.SuppressLint
@@ -33,6 +35,7 @@ import kotlinx.coroutines.withContext
 import org.readium.r2.lcp.LcpAuthenticating
 import org.readium.r2.lcp.R
 import org.readium.r2.lcp.license.model.components.Link
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.extensions.tryOr
 import org.readium.r2.shared.extensions.tryOrNull
 import org.readium.r2.shared.util.AbsoluteUrl

readium/lcp/src/main/java/org/readium/r2/lcp/license/License.kt

@@ -7,6 +7,8 @@
  * LICENSE file present in the project repository where this source code is maintained.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.r2.lcp.license
 
 import java.net.HttpURLConnection
@@ -29,6 +31,7 @@ import org.readium.r2.lcp.service.DeviceService
 import org.readium.r2.lcp.service.LcpClient
 import org.readium.r2.lcp.service.LicensesRepository
 import org.readium.r2.lcp.service.NetworkService
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.extensions.tryOrNull
 import org.readium.r2.shared.util.Instant
 import org.readium.r2.shared.util.Try

readium/lcp/src/main/java/org/readium/r2/lcp/license/model/LicenseDocument.kt

@@ -7,6 +7,8 @@
  * LICENSE file present in the project repository where this source code is maintained.
  */
 
+@file:OptIn(InternalReadiumApi::class)
+
 package org.readium.r2.lcp.license.model
 
 import java.nio.charset.Charset
@@ -20,6 +22,7 @@ import org.readium.r2.lcp.license.model.components.lcp.Rights
 import org.readium.r2.lcp.license.model.components.lcp.Signature
 import org.readium.r2.lcp.license.model.components.lcp.User
 import org.readium.r2.lcp.service.URLParameters
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.extensions.optNullableString
 import org.readium.r2.shared.util.AbsoluteUrl
 import org.readium.r2.shared.util.Instant