readium · mickael-menu · May 14, 2025 · May 14, 2025 · May 14, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,12 @@ All notable changes to this project will be documented in this file. Take a look
 
 **Warning:** Features marked as *experimental* may change or be removed in a future release without notice. Use with caution.
 
-<!-- ## [Unreleased] -->
+## [Unreleased]
+
+### Fixed
+
+* [#662](https://github.com/readium/kotlin-toolkit/issues/662) Fixed duplicate class when using `readium-adapter-pdfium`.
+
 
 ## [3.1.0]
 

diff --git a/readium/adapters/pdfium/common/build.gradle.kts b/readium/adapters/pdfium/common/build.gradle.kts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2022 Readium Foundation. All rights reserved.
+ * Use of this source code is governed by the BSD-style license
+ * available in the top-level LICENSE file of the project.
+ */
+
+plugins {
+    id("readium.library-conventions")
+}
+
+android {
+    namespace = "org.readium.adapter.pdfium.common"
+}
+
+dependencies {
+    api(files("libs/pdfium-android-1.8.2.jar"))
+}
diff --git a/readium/adapters/pdfium/common/gradle.properties b/readium/adapters/pdfium/common/gradle.properties
@@ -0,0 +1 @@
+pom.artifactId=readium-adapter-pdfium-common
diff --git a/...ters/pdfium/libs/pdfium-android-1.8.2.jar → ...fium/common/libs/pdfium-android-1.8.2.jar b/...ters/pdfium/libs/pdfium-android-1.8.2.jar → ...fium/common/libs/pdfium-android-1.8.2.jar
diff --git a/readium/adapters/pdfium/common/src/main/AndroidManifest.xml b/readium/adapters/pdfium/common/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />
+
diff --git a/...rc/main/jniLibs/arm64-v8a/libjniPdfium.so → ...rc/main/jniLibs/arm64-v8a/libjniPdfium.so b/...rc/main/jniLibs/arm64-v8a/libjniPdfium.so → ...rc/main/jniLibs/arm64-v8a/libjniPdfium.so
diff --git a/...t/src/main/jniLibs/arm64-v8a/libmodft2.so → ...n/src/main/jniLibs/arm64-v8a/libmodft2.so b/...t/src/main/jniLibs/arm64-v8a/libmodft2.so → ...n/src/main/jniLibs/arm64-v8a/libmodft2.so
diff --git a/...rc/main/jniLibs/arm64-v8a/libmodpdfium.so → ...rc/main/jniLibs/arm64-v8a/libmodpdfium.so b/...rc/main/jniLibs/arm64-v8a/libmodpdfium.so → ...rc/main/jniLibs/arm64-v8a/libmodpdfium.so
diff --git a/...t/src/main/jniLibs/arm64-v8a/libmodpng.so → ...n/src/main/jniLibs/arm64-v8a/libmodpng.so b/...t/src/main/jniLibs/arm64-v8a/libmodpng.so → ...n/src/main/jniLibs/arm64-v8a/libmodpng.so
diff --git a/.../main/jniLibs/armeabi-v7a/libjniPdfium.so → .../main/jniLibs/armeabi-v7a/libjniPdfium.so b/.../main/jniLibs/armeabi-v7a/libjniPdfium.so → .../main/jniLibs/armeabi-v7a/libjniPdfium.so
diff --git a/...src/main/jniLibs/armeabi-v7a/libmodft2.so → ...src/main/jniLibs/armeabi-v7a/libmodft2.so b/...src/main/jniLibs/armeabi-v7a/libmodft2.so → ...src/main/jniLibs/armeabi-v7a/libmodft2.so
diff --git a/.../main/jniLibs/armeabi-v7a/libmodpdfium.so → .../main/jniLibs/armeabi-v7a/libmodpdfium.so b/.../main/jniLibs/armeabi-v7a/libmodpdfium.so → .../main/jniLibs/armeabi-v7a/libmodpdfium.so
diff --git a/...src/main/jniLibs/armeabi-v7a/libmodpng.so → ...src/main/jniLibs/armeabi-v7a/libmodpng.so b/...src/main/jniLibs/armeabi-v7a/libmodpng.so → ...src/main/jniLibs/armeabi-v7a/libmodpng.so
diff --git a/.../src/main/jniLibs/armeabi/libjniPdfium.so → .../src/main/jniLibs/armeabi/libjniPdfium.so b/.../src/main/jniLibs/armeabi/libjniPdfium.so → .../src/main/jniLibs/armeabi/libjniPdfium.so
diff --git a/...ent/src/main/jniLibs/armeabi/libmodft2.so → ...mon/src/main/jniLibs/armeabi/libmodft2.so b/...ent/src/main/jniLibs/armeabi/libmodft2.so → ...mon/src/main/jniLibs/armeabi/libmodft2.so
diff --git a/.../src/main/jniLibs/armeabi/libmodpdfium.so → .../src/main/jniLibs/armeabi/libmodpdfium.so b/.../src/main/jniLibs/armeabi/libmodpdfium.so → .../src/main/jniLibs/armeabi/libmodpdfium.so
diff --git a/...ent/src/main/jniLibs/armeabi/libmodpng.so → ...mon/src/main/jniLibs/armeabi/libmodpng.so b/...ent/src/main/jniLibs/armeabi/libmodpng.so → ...mon/src/main/jniLibs/armeabi/libmodpng.so
diff --git a/...ent/src/main/jniLibs/mips/libjniPdfium.so → ...mon/src/main/jniLibs/mips/libjniPdfium.so b/...ent/src/main/jniLibs/mips/libjniPdfium.so → ...mon/src/main/jniLibs/mips/libjniPdfium.so
diff --git a/...cument/src/main/jniLibs/mips/libmodft2.so → ...common/src/main/jniLibs/mips/libmodft2.so b/...cument/src/main/jniLibs/mips/libmodft2.so → ...common/src/main/jniLibs/mips/libmodft2.so
diff --git a/...ent/src/main/jniLibs/mips/libmodpdfium.so → ...mon/src/main/jniLibs/mips/libmodpdfium.so b/...ent/src/main/jniLibs/mips/libmodpdfium.so → ...mon/src/main/jniLibs/mips/libmodpdfium.so
diff --git a/...cument/src/main/jniLibs/mips/libmodpng.so → ...common/src/main/jniLibs/mips/libmodpng.so b/...cument/src/main/jniLibs/mips/libmodpng.so → ...common/src/main/jniLibs/mips/libmodpng.so
diff --git a/...ment/src/main/jniLibs/x86/libjniPdfium.so → ...mmon/src/main/jniLibs/x86/libjniPdfium.so b/...ment/src/main/jniLibs/x86/libjniPdfium.so → ...mmon/src/main/jniLibs/x86/libjniPdfium.so
diff --git a/...ocument/src/main/jniLibs/x86/libmodft2.so → .../common/src/main/jniLibs/x86/libmodft2.so b/...ocument/src/main/jniLibs/x86/libmodft2.so → .../common/src/main/jniLibs/x86/libmodft2.so
diff --git a/...ment/src/main/jniLibs/x86/libmodpdfium.so → ...mmon/src/main/jniLibs/x86/libmodpdfium.so b/...ment/src/main/jniLibs/x86/libmodpdfium.so → ...mmon/src/main/jniLibs/x86/libmodpdfium.so
diff --git a/...ocument/src/main/jniLibs/x86/libmodpng.so → .../common/src/main/jniLibs/x86/libmodpng.so b/...ocument/src/main/jniLibs/x86/libmodpng.so → .../common/src/main/jniLibs/x86/libmodpng.so
diff --git a/...t/src/main/jniLibs/x86_64/libjniPdfium.so → ...n/src/main/jniLibs/x86_64/libjniPdfium.so b/...t/src/main/jniLibs/x86_64/libjniPdfium.so → ...n/src/main/jniLibs/x86_64/libjniPdfium.so
diff --git a/...ment/src/main/jniLibs/x86_64/libmodft2.so → ...mmon/src/main/jniLibs/x86_64/libmodft2.so b/...ment/src/main/jniLibs/x86_64/libmodft2.so → ...mmon/src/main/jniLibs/x86_64/libmodft2.so
diff --git a/...t/src/main/jniLibs/x86_64/libmodpdfium.so → ...n/src/main/jniLibs/x86_64/libmodpdfium.so b/...t/src/main/jniLibs/x86_64/libmodpdfium.so → ...n/src/main/jniLibs/x86_64/libmodpdfium.so
diff --git a/...ment/src/main/jniLibs/x86_64/libmodpng.so → ...mmon/src/main/jniLibs/x86_64/libmodpng.so b/...ment/src/main/jniLibs/x86_64/libmodpng.so → ...mmon/src/main/jniLibs/x86_64/libmodpng.so
diff --git a/readium/adapters/pdfium/document/build.gradle.kts b/readium/adapters/pdfium/document/build.gradle.kts
@@ -14,7 +14,7 @@ android {
 
 dependencies {
     api(project(":readium:readium-shared"))
-    implementation(files("../libs/pdfium-android-1.8.2.jar"))
+    implementation(project(":readium:adapters:pdfium:readium-adapter-pdfium-common"))
 
     implementation(libs.timber)
     implementation(libs.kotlinx.coroutines.android)

diff --git a/readium/adapters/pdfium/navigator/build.gradle.kts b/readium/adapters/pdfium/navigator/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     api(project(":readium:readium-shared"))
     api(project(":readium:readium-navigator"))
     api(project(":readium:adapters:pdfium:readium-adapter-pdfium-document"))
-    implementation(files("../libs/pdfium-android-1.8.2.jar"))
+    implementation(project(":readium:adapters:pdfium:readium-adapter-pdfium-common"))
     implementation(files("libs/android-pdf-viewer-2.8.2.jar"))
 
     implementation(libs.androidx.fragment.ktx)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -17,6 +17,10 @@ dependencyResolutionManagement {
 
 rootProject.name = "Readium"
 
+include(":readium:adapters:pdfium:common")
+project(":readium:adapters:pdfium:common")
+    .name = "readium-adapter-pdfium-common"
+
 include(":readium:adapters:pdfium:document")
 project(":readium:adapters:pdfium:document")
     .name = "readium-adapter-pdfium-document"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		<?xml version="1.0" encoding="utf-8"?>
		<manifest />