diff --git a/README.md b/README.md index 46b9be992c..a1921290d7 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ A [Test App](test-app) demonstrates how to integrate the Readium Kotlin toolkit ## Setting Up Readium -Readium modules are distributed with [Maven Central](https://search.maven.org/search?q=g:org.readium.kotlin-toolkit). Make sure that you have the `$readium_version` property set in your root `build.gradle`, then add the Maven Central and JCenter repositories. +Readium modules are distributed with [Maven Central](https://search.maven.org/search?q=g:org.readium.kotlin-toolkit). Make sure that you have the `$readium_version` property set in your root `build.gradle`, then add the Maven Central repository. ```groovy buildscript { @@ -34,7 +34,6 @@ buildscript { allprojects { repositories { - jcenter() mavenCentral() } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a32be7e185..962365e7d1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -127,7 +127,6 @@ kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-cor 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" } -pdf-viewer = { group = "com.github.barteksc", name ="android-pdf-viewer", version.ref="pdf-viewer" } picasso = { group = "com.squareup.picasso", name = "picasso", version.ref = "picasso" } pspdfkit = { group = "com.pspdfkit", name = "pspdfkit", version.ref ="pspdfkit" } diff --git a/readium/adapters/pdfium/android-pdf-viewer/android-pdf-viewer-2.8.2.aar b/readium/adapters/pdfium/android-pdf-viewer/android-pdf-viewer-2.8.2.aar new file mode 100644 index 0000000000..2c8366c4b7 Binary files /dev/null and b/readium/adapters/pdfium/android-pdf-viewer/android-pdf-viewer-2.8.2.aar differ diff --git a/readium/adapters/pdfium/android-pdf-viewer/build.gradle.kts b/readium/adapters/pdfium/android-pdf-viewer/build.gradle.kts new file mode 100644 index 0000000000..bd61ffdd9b --- /dev/null +++ b/readium/adapters/pdfium/android-pdf-viewer/build.gradle.kts @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file("android-pdf-viewer-2.8.2.aar")) diff --git a/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts b/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts index 31ce3a0f4d..ae5f0e9b78 100644 --- a/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts +++ b/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts @@ -51,9 +51,10 @@ dependencies { api(project(":readium:readium-shared")) api(project(":readium:readium-navigator")) api(project(":readium:adapters:pdfium:readium-adapter-pdfium-document")) + api(project(":readium:adapters:pdfium:android-pdf-viewer")) - api(libs.pdf.viewer) implementation(libs.androidx.fragment.ktx) + implementation(libs.pdfium) implementation(libs.timber) implementation(libs.bundles.coroutines) implementation(libs.kotlinx.serialization.json) diff --git a/settings.gradle.kts b/settings.gradle.kts index c1b9f5d53a..8fb9509680 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -33,7 +33,6 @@ dependencyResolutionManagement { google() mavenLocal() mavenCentral() - maven(url = "https://jcenter.bintray.com") maven(url = "https://s3.amazonaws.com/repo.commonsware.com") maven(url = "https://customers.pspdfkit.com/maven") } @@ -81,6 +80,8 @@ include(":readium:streamer") project(":readium:streamer") .name = "readium-streamer" -if (System.getenv("JITPACK") == null) { - include("test-app") -} +include(":readium:adapters:pdfium:android-pdf-viewer") +project(":readium:adapters:pdfium:android-pdf-viewer") + .name = "android-pdf-viewer" + +include("test-app")