From bd50ebd95dc10eb1cd25b9d92ea046d612e464d4 Mon Sep 17 00:00:00 2001
From: Steven Zeck <8315038+stevenzeck@users.noreply.github.com>
Date: Tue, 30 Jan 2024 23:53:10 -0600
Subject: [PATCH 1/5] Cleanup versions and gradle files

---
 .github/workflows/docs.yml                    |  2 +-
 .idea/inspectionProfiles/Project_Default.xml  | 27 +++++++++++++++++
 build.gradle.kts                              |  7 ++---
 gradle/libs.versions.toml                     | 30 ++++++++++---------
 .../adapters/exoplayer/audio/build.gradle.kts |  2 +-
 .../adapters/pdfium/document/build.gradle.kts |  2 +-
 .../pdfium/navigator/build.gradle.kts         |  2 +-
 .../pspdfkit/document/build.gradle.kts        |  2 +-
 .../pspdfkit/navigator/build.gradle.kts       |  2 +-
 readium/lcp/build.gradle.kts                  |  2 +-
 readium/navigator-media2/build.gradle.kts     |  5 +---
 readium/navigator/build.gradle.kts            |  2 +-
 .../navigators/media/audio/build.gradle.kts   |  2 +-
 .../navigators/media/common/build.gradle.kts  |  2 +-
 readium/navigators/media/tts/build.gradle.kts |  2 +-
 readium/opds/build.gradle.kts                 |  2 +-
 readium/shared/build.gradle.kts               |  2 +-
 readium/streamer/build.gradle.kts             |  2 +-
 test-app/build.gradle.kts                     |  2 +-
 19 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 4abba3507f..f44386e418 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -37,7 +37,7 @@ jobs:
         run: echo "READIUM_VERSION=`git describe --tag --match [0-9]* --abbrev=0`" >> $GITHUB_ENV
 
       - name: Run Dokka
-        run: ./gradlew dokkaGfmMultiModule
+        run: ./gradlew :dokkaGfmMultiModule
 
       - name: Copy README.md into docs to replace Dokka index.md
         run: cp README.md index.md
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index fce63edd0b..b0c1379896 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,33 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="SwiftRedundantAttribute" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="SwiftRedundantReturn" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="SwiftUnnecessaryParentheses" enabled="false" level="INFORMATION" enabled_by_default="false" />
diff --git a/build.gradle.kts b/build.gradle.kts
index 7e96d92cc2..5a6a65465e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,6 +12,9 @@ plugins {
 }
 
 subprojects {
+    if (name != "test-app") {
+        apply(plugin = "org.jetbrains.dokka")
+    }
     apply(plugin = "org.jlleitschuh.gradle.ktlint")
 
     ktlint {
@@ -19,10 +22,6 @@ subprojects {
     }
 }
 
-tasks.register("clean", Delete::class).configure {
-    delete(rootProject.buildDir)
-}
-
 tasks.register("cleanDocs", Delete::class).configure {
     delete("${project.rootDir}/docs/readium", "${project.rootDir}/docs/index.md", "${project.rootDir}/site")
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4102303856..1783d94be2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
 
 kotlin = "1.9.22"
-agp = "8.2.1"
+agp = "8.2.2"
 gradle-maven-publish-plugin = "0.27.0"
 
-accompanist = "0.32.0"
+accompanist = "0.34.0"
 
 androidx-activity = "1.8.2"
 androidx-appcompat = "1.6.1"
@@ -13,12 +13,12 @@ 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.5.4"
-androidx-compose-foundation = "1.5.4"
-androidx-compose-material = "1.5.4"
+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.5.4"
-androidx-compose-ui = "1.5.4"
+androidx-compose-runtime = "1.6.0"
+androidx-compose-ui = "1.6.0"
 androidx-constraintlayout = "2.1.4"
 androidx-core = "1.12.0"
 androidx-datastore = "1.0.0"
@@ -30,15 +30,15 @@ androidx-lifecycle = "2.7.0"
 androidx-lifecycle-extensions = "2.2.0"
 androidx-media = "1.7.0"
 androidx-media2 = "1.3.0"
-androidx-media3 = "1.2.0"
+androidx-media3 = "1.2.1"
 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"
+androidx-webkit = "1.10.0"
 
-assertj = "3.25.1"
+assertj = "3.25.2"
 
 dokka = "1.9.10"
 
@@ -83,6 +83,7 @@ androidx-compose-foundation = { group = "androidx.compose.foundation", name = "f
 androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "androidx-compose-material" }
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidx-compose-material3" }
 androidx-compose-material-icons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidx-compose-material" }
+androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "androidx-compose-runtime" }
 androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidx-compose-ui" }
 androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidx-compose-ui" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
@@ -137,7 +138,6 @@ kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", vers
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
 
 kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines-test" }
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
 
@@ -155,17 +155,19 @@ plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.
 plugin-maven-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradle-maven-publish-plugin" }
 
 [plugins]
+
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 
 [bundles]
-compose = ["androidx-compose-activity", "androidx-compose-animation", "androidx-compose-foundation", "androidx-compose-material", "androidx-compose-material3", "androidx-compose-material-icons", "androidx-compose-ui", "androidx-compose-ui-tooling"]
-coroutines = ["kotlinx-coroutines-core", "kotlinx-coroutines-android"]
+
+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"]
 exoplayer = ["google-exoplayer-core", "google-exoplayer-ui", "google-exoplayer-mediasession", "google-exoplayer-workmanager", "google-exoplayer-extension-media2"]
 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"]
+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"]
diff --git a/readium/adapters/exoplayer/audio/build.gradle.kts b/readium/adapters/exoplayer/audio/build.gradle.kts
index d947f2002c..88ab7090c6 100644
--- a/readium/adapters/exoplayer/audio/build.gradle.kts
+++ b/readium/adapters/exoplayer/audio/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     implementation(libs.androidx.media3.common)
     implementation(libs.androidx.media3.exoplayer)
     implementation(libs.timber)
-    implementation(libs.bundles.coroutines)
+    implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)
 
     // Tests
diff --git a/readium/adapters/pdfium/document/build.gradle.kts b/readium/adapters/pdfium/document/build.gradle.kts
index e44ca05bef..93b145f568 100644
--- a/readium/adapters/pdfium/document/build.gradle.kts
+++ b/readium/adapters/pdfium/document/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     implementation(libs.androidx.core)
     implementation(libs.pdfium)
     implementation(libs.timber)
-    implementation(libs.bundles.coroutines)
+    implementation(libs.kotlinx.coroutines.android)
 
     testImplementation(libs.junit)
 
diff --git a/readium/adapters/pdfium/navigator/build.gradle.kts b/readium/adapters/pdfium/navigator/build.gradle.kts
index 71e211cfc7..b5c59373e0 100644
--- a/readium/adapters/pdfium/navigator/build.gradle.kts
+++ b/readium/adapters/pdfium/navigator/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     api(libs.pdf.viewer)
     implementation(libs.androidx.fragment.ktx)
     implementation(libs.timber)
-    implementation(libs.bundles.coroutines)
+    implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)
 
     testImplementation(libs.junit)
diff --git a/readium/adapters/pspdfkit/document/build.gradle.kts b/readium/adapters/pspdfkit/document/build.gradle.kts
index 96271e024c..bbfbaadbd9 100644
--- a/readium/adapters/pspdfkit/document/build.gradle.kts
+++ b/readium/adapters/pspdfkit/document/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     implementation(libs.androidx.core)
     implementation(libs.timber)
     implementation(libs.pspdfkit)
-    implementation(libs.bundles.coroutines)
+    implementation(libs.kotlinx.coroutines.android)
 
     testImplementation(libs.junit)
 
diff --git a/readium/adapters/pspdfkit/navigator/build.gradle.kts b/readium/adapters/pspdfkit/navigator/build.gradle.kts
index 7f062e44e7..67f4dd44e8 100644
--- a/readium/adapters/pspdfkit/navigator/build.gradle.kts
+++ b/readium/adapters/pspdfkit/navigator/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
     implementation(libs.androidx.fragment.ktx)
     implementation(libs.timber)
     implementation(libs.pspdfkit)
-    implementation(libs.bundles.coroutines)
+    implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)
 
     testImplementation(libs.junit)
diff --git a/readium/lcp/build.gradle.kts b/readium/lcp/build.gradle.kts
index b165d4ab67..8a2aec53ef 100644
--- a/readium/lcp/build.gradle.kts
+++ b/readium/lcp/build.gradle.kts
@@ -14,7 +14,7 @@ android {
 }
 
 dependencies {
-    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
 
     api(project(":readium:readium-shared"))
 
diff --git a/readium/navigator-media2/build.gradle.kts b/readium/navigator-media2/build.gradle.kts
index 135ae68d67..eb8d371d5d 100644
--- a/readium/navigator-media2/build.gradle.kts
+++ b/readium/navigator-media2/build.gradle.kts
@@ -20,15 +20,12 @@ dependencies {
     api(project(":readium:readium-shared"))
     api(project(":readium:readium-navigator"))
 
-    implementation(libs.bundles.coroutines)
+    implementation(libs.kotlinx.coroutines.android)
 
     implementation(libs.timber)
 
     implementation(libs.bundles.media2)
 
-    implementation(libs.google.exoplayer.core)
-    implementation(libs.google.exoplayer.extension.media2)
-
     testImplementation(libs.junit)
 
     androidTestImplementation(libs.androidx.ext.junit)
diff --git a/readium/navigator/build.gradle.kts b/readium/navigator/build.gradle.kts
index a4598f1418..4f126d7141 100644
--- a/readium/navigator/build.gradle.kts
+++ b/readium/navigator/build.gradle.kts
@@ -43,7 +43,7 @@ dependencies {
     implementation(libs.google.material)
     implementation(libs.timber)
     implementation(libs.joda.time)
-    implementation(libs.bundles.coroutines)
+    implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.jsoup)
 
diff --git a/readium/navigators/media/audio/build.gradle.kts b/readium/navigators/media/audio/build.gradle.kts
index 70ab7a9c69..cb5f55932d 100644
--- a/readium/navigators/media/audio/build.gradle.kts
+++ b/readium/navigators/media/audio/build.gradle.kts
@@ -24,5 +24,5 @@ dependencies {
 
     implementation(libs.androidx.core)
     implementation(libs.timber)
-    implementation(libs.bundles.coroutines)
+    implementation(libs.kotlinx.coroutines.android)
 }
diff --git a/readium/navigators/media/common/build.gradle.kts b/readium/navigators/media/common/build.gradle.kts
index 54259812a7..dabdc180fb 100644
--- a/readium/navigators/media/common/build.gradle.kts
+++ b/readium/navigators/media/common/build.gradle.kts
@@ -18,5 +18,5 @@ dependencies {
 
     implementation(libs.androidx.media3.common)
     implementation(libs.timber)
-    implementation(libs.bundles.coroutines)
+    implementation(libs.kotlinx.coroutines.android)
 }
diff --git a/readium/navigators/media/tts/build.gradle.kts b/readium/navigators/media/tts/build.gradle.kts
index dbec6e0724..91c99e291c 100644
--- a/readium/navigators/media/tts/build.gradle.kts
+++ b/readium/navigators/media/tts/build.gradle.kts
@@ -20,6 +20,6 @@ dependencies {
     implementation(libs.androidx.media3.session)
 
     implementation(libs.timber)
-    implementation(libs.bundles.coroutines)
+    implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)
 }
diff --git a/readium/opds/build.gradle.kts b/readium/opds/build.gradle.kts
index a890b23341..5a8d26219a 100644
--- a/readium/opds/build.gradle.kts
+++ b/readium/opds/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     implementation(libs.androidx.appcompat)
     implementation(libs.timber)
     implementation(libs.joda.time)
-    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
 
     // Tests
     testImplementation(libs.junit)
diff --git a/readium/shared/build.gradle.kts b/readium/shared/build.gradle.kts
index 13533ca1d0..b5a78a86d6 100644
--- a/readium/shared/build.gradle.kts
+++ b/readium/shared/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     implementation(libs.timber)
     implementation(libs.joda.time)
     implementation(libs.kotlin.reflect)
-    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.jsoup)
 
diff --git a/readium/streamer/build.gradle.kts b/readium/streamer/build.gradle.kts
index f846c14e48..506d0951b5 100644
--- a/readium/streamer/build.gradle.kts
+++ b/readium/streamer/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
         exclude(module = "support-v4")
     }
     implementation(libs.joda.time)
-    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
 
     // Tests
     testImplementation(libs.junit)
diff --git a/test-app/build.gradle.kts b/test-app/build.gradle.kts
index f4fcbc9989..6b8f2c910e 100644
--- a/test-app/build.gradle.kts
+++ b/test-app/build.gradle.kts
@@ -107,7 +107,7 @@ dependencies {
     implementation(libs.timber)
     implementation(libs.picasso)
     implementation(libs.joda.time)
-    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
     implementation(libs.jsoup)
 
     implementation(libs.bundles.media3)

From ae4c6298452b717e1a45dffff017f0631bc5acfd Mon Sep 17 00:00:00 2001
From: Steven Zeck <8315038+stevenzeck@users.noreply.github.com>
Date: Tue, 30 Jan 2024 23:56:14 -0600
Subject: [PATCH 2/5] Update libs.versions.toml

---
 gradle/libs.versions.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1783d94be2..840b2c28f2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -158,7 +158,6 @@ plugin-maven-publish = { module = "com.vanniktech:gradle-maven-publish-plugin",
 
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 

From 410576c0a014dc4323f4c5e7cf7ecb9667439d50 Mon Sep 17 00:00:00 2001
From: Steven Zeck <8315038+stevenzeck@users.noreply.github.com>
Date: Wed, 31 Jan 2024 00:11:53 -0600
Subject: [PATCH 3/5] Revert changes to Project_Default

---
 .idea/inspectionProfiles/Project_Default.xml | 27 --------------------
 1 file changed, 27 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index b0c1379896..fce63edd0b 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,33 +1,6 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
     <inspection_tool class="SwiftRedundantAttribute" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="SwiftRedundantReturn" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="SwiftUnnecessaryParentheses" enabled="false" level="INFORMATION" enabled_by_default="false" />

From fcf91cb87a6670003c026b2f93504985c3f68688 Mon Sep 17 00:00:00 2001
From: Steven Zeck <8315038+stevenzeck@users.noreply.github.com>
Date: Wed, 31 Jan 2024 20:01:31 -0600
Subject: [PATCH 4/5] More cleanup

---
 gradle/libs.versions.toml | 3 ---
 test-app/build.gradle.kts | 1 -
 2 files changed, 4 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 840b2c28f2..afb99a75a6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -119,8 +119,6 @@ androidx-webkit = { group = "androidx.webkit", name = "webkit", version.ref = "a
 
 assertj = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" }
 
-dokka-gradle = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version.ref = "dokka" }
-
 google-exoplayer-core = { group = "com.google.android.exoplayer", name = "exoplayer-core", version.ref = "google-exoplayer" }
 google-exoplayer-extension-media2 = { group = "com.google.android.exoplayer", name = "extension-media2", version.ref = "google-exoplayer" }
 google-exoplayer-mediasession = { group = "com.google.android.exoplayer", name = "extension-mediasession", version.ref = "google-exoplayer" }
@@ -132,7 +130,6 @@ joda-time = { group = "joda-time", name = "joda-time", version.ref = "joda-time"
 jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 
-kotlin-gradle = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
diff --git a/test-app/build.gradle.kts b/test-app/build.gradle.kts
index 6b8f2c910e..e1a8582f6b 100644
--- a/test-app/build.gradle.kts
+++ b/test-app/build.gradle.kts
@@ -83,7 +83,6 @@ dependencies {
 
     implementation(libs.accompanist.themeadapter.material)
 
-    implementation(libs.androidx.compose.activity)
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.browser)

From 2ccfe9ef5496b01c0a24b63637b096fb9dbc31f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Menu?= <mickael.menu@gmail.com>
Date: Mon, 5 Feb 2024 15:43:30 +0100
Subject: [PATCH 5/5] Update README and migration guide

---
 README.md               | 2 +-
 docs/migration-guide.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dd9ef21ca1..e091d183dc 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ A [Test App](test-app) demonstrates how to integrate the Readium Kotlin toolkit
 
 | Readium | Android min SDK | Android compile SDK | Kotlin compiler (✻) | Gradle (✻) |
 |---------|-----------------|---------------------|---------------------|------------|
-| 3.0.0   | 21              | 34                  | 1.9.22              | 8.2.0      |
+| 3.0.0   | 21              | 34                  | 1.9.22              | 8.2.2      |
 | 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.
diff --git a/docs/migration-guide.md b/docs/migration-guide.md
index 7347af208d..1b2c09bcf2 100644
--- a/docs/migration-guide.md
+++ b/docs/migration-guide.md
@@ -8,7 +8,7 @@ First of all, upgrade to version 2.4.0 and resolve any deprecation notices. This
 
 ### Minimum requirements
 
-If you integrate Readium 3.0 as a submodule, it requires Kotlin 1.9.22 and Gradle 8.2.0. You should start by updating these dependencies in your application.
+If you integrate Readium 3.0 as a submodule, it requires Kotlin 1.9.22 and Gradle 8.2.2. You should start by updating these dependencies in your application.
 
 #### Targeting Android SDK 34