Remove Jetifier (#610)

Author: mickael-menu

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]
+
+### Changed
+
+* Jetifier is not required anymore, you can remove `android.enableJetifier=true` from your `gradle.properties` if you were using Readium as a local clone.
+
 
 ## [3.0.3]
 

README.md

@@ -56,12 +56,6 @@ First, add the repository as a Git submodule of your app repository, then checko
 git submodule add https://github.com/readium/kotlin-toolkit.git
 ```
 
-Make sure you have Jetifier enabled in your `gradle.properties` file:
-
-```properties
-android.enableJetifier=true
-```
-
 Then, include the Readium build to your project's `settings.gradle` file. The Readium dependencies will automatically build against the local sources.
 
 ```groovy

gradle.properties

@@ -23,8 +23,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 

gradle/libs.versions.toml

@@ -54,9 +54,6 @@ ktlint = "12.1.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"
 
@@ -119,7 +116,6 @@ kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-cor
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinx-datetime" }
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
 
-pdfium = { group = "com.github.barteksc", name = "pdfium-android", version.ref="pdfium" }
 picasso = { group = "com.squareup.picasso", name = "picasso", version.ref = "picasso" }
 pspdfkit = { group = "com.pspdfkit", name = "pspdfkit", version.ref ="pspdfkit" }
 

readium/adapters/pdfium/document/build.gradle.kts

@@ -14,8 +14,8 @@ android {
 
 dependencies {
     api(project(":readium:readium-shared"))
+    implementation(files("../libs/pdfium-android-1.8.2.jar"))
 
-    implementation(libs.pdfium)
     implementation(libs.timber)
     implementation(libs.kotlinx.coroutines.android)
 }

readium/adapters/pdfium/document/src/main/jniLibs/arm64-v8a/libjniPdfium.so

@@ -21,10 +21,10 @@ 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(files("libs/android-pdf-viewer-2.8.2.jar"))
 
     implementation(libs.androidx.fragment.ktx)
-    implementation(libs.pdfium)
     implementation(libs.timber)
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)