Remove dependency on JitPack (#314)

mickael-menu · web-flow · commit cdbbf2008ae0 · 2022-12-25T10:11:38.000+01:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -48,7 +48,6 @@ kotlinx-serialization-json = "1.4.1"
 
 pdfium = "1.8.2"
 pdf-viewer = "2.8.2"
-photoview = "2.3.0"
 picasso = "2.71828"
 pspdfkit = "8.4.1"
 
@@ -125,7 +124,6 @@ kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-
 
 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" }
-photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref = "photoview" }
 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/pdfium-document/build.gradle.kts b/readium/adapters/pdfium/pdfium-document/build.gradle.kts
@@ -61,8 +61,6 @@ publishing {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     api(project(":readium:readium-shared"))
 
     implementation(libs.androidx.core)
diff --git a/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts b/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts
@@ -62,8 +62,6 @@ publishing {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     api(project(":readium:readium-shared"))
     api(project(":readium:readium-navigator"))
     api(project(":readium:adapters:pdfium:readium-adapter-pdfium-document"))
diff --git a/readium/adapters/pspdfkit/pspdfkit-document/build.gradle.kts b/readium/adapters/pspdfkit/pspdfkit-document/build.gradle.kts
@@ -61,8 +61,6 @@ publishing {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     api(project(":readium:readium-shared"))
 
     implementation(libs.androidx.core)
diff --git a/readium/adapters/pspdfkit/pspdfkit-navigator/build.gradle.kts b/readium/adapters/pspdfkit/pspdfkit-navigator/build.gradle.kts
@@ -62,8 +62,6 @@ publishing {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     api(project(":readium:readium-shared"))
     api(project(":readium:readium-navigator"))
     api(project(":readium:adapters:pspdfkit:readium-adapter-pspdfkit-document"))
diff --git a/readium/lcp/build.gradle.kts b/readium/lcp/build.gradle.kts
@@ -58,8 +58,6 @@ publishing {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     implementation(libs.kotlinx.coroutines.core)
 
     api(project(":readium:readium-shared"))
diff --git a/readium/navigator-media2/build.gradle.kts b/readium/navigator-media2/build.gradle.kts
@@ -62,8 +62,6 @@ publishing {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     api(project(":readium:readium-shared"))
     api(project(":readium:readium-navigator"))
 
diff --git a/readium/navigator/build.gradle.kts b/readium/navigator/build.gradle.kts
@@ -66,10 +66,10 @@ publishing {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     api(project(":readium:readium-shared"))
 
+    implementation(files("libs/PhotoView-2.3.0.jar"))
+
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.browser)
@@ -85,8 +85,6 @@ dependencies {
     implementation(libs.androidx.webkit)
     // Needed to avoid a crash with API 31, see https://stackoverflow.com/a/69152986/1474476
     implementation("androidx.work:work-runtime-ktx:2.7.1")
-    // ChrisBane/PhotoView ( for the Zoom handling )
-    implementation(libs.photoview)
 
     implementation(libs.bundles.media2)
     // ExoPlayer is used by the Audio Navigator.
diff --git a/readium/navigator/libs/PhotoView-2.3.0.jar b/readium/navigator/libs/PhotoView-2.3.0.jar
diff --git a/readium/opds/build.gradle.kts b/readium/opds/build.gradle.kts
@@ -58,8 +58,6 @@ publishing {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     api(project(":readium:readium-shared"))
 
     implementation(libs.androidx.appcompat)
diff --git a/readium/shared/build.gradle.kts b/readium/shared/build.gradle.kts
@@ -59,8 +59,6 @@ publishing {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.browser)
     implementation("com.github.kittinunf.fuel:fuel-android:2.3.1")
diff --git a/readium/streamer/build.gradle.kts b/readium/streamer/build.gradle.kts
@@ -58,19 +58,13 @@ publishing {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     api(project(":readium:readium-shared"))
 
+    api(files("libs/nanohttpd-2.3.2.jar", "libs/nanohttpd-nanolets-2.3.2.jar"))
+
     implementation(libs.androidx.appcompat)
     @Suppress("GradleDependency")
     implementation(libs.timber)
-    api("com.github.readium.nanohttpd:nanohttpd:master-SNAPSHOT") {
-        exclude(group = "org.parboiled")
-    }
-    api("com.github.readium.nanohttpd:nanohttpd-nanolets:master-SNAPSHOT") {
-        exclude(group = "org.parboiled")
-    }
     // AM NOTE: conflicting support libraries, excluding these
     implementation("com.mcxiaoke.koi:core:0.5.5") {
         exclude(module = "support-v4")
diff --git a/readium/streamer/libs/nanohttpd-2.3.2.jar b/readium/streamer/libs/nanohttpd-2.3.2.jar
diff --git a/readium/streamer/libs/nanohttpd-nanolets-2.3.2.jar b/readium/streamer/libs/nanohttpd-nanolets-2.3.2.jar
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -11,7 +11,6 @@ pluginManagement {
         mavenLocal()
         mavenCentral()
         maven(url = "https://jcenter.bintray.com")
-        maven(url = "https://jitpack.io")
         maven(url = "https://s3.amazonaws.com/repo.commonsware.com")
     }
 
@@ -34,7 +33,6 @@ dependencyResolutionManagement {
         mavenLocal()
         mavenCentral()
         maven(url = "https://jcenter.bintray.com")
-        maven(url = "https://jitpack.io")
         maven(url = "https://s3.amazonaws.com/repo.commonsware.com")
         maven(url = "https://customers.pspdfkit.com/maven")
     }
diff --git a/test-app/build.gradle.kts b/test-app/build.gradle.kts
@@ -63,7 +63,6 @@ android {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
     implementation(libs.kotlin.stdlib)
     implementation(libs.androidx.legacy.v4)
 

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,6 @@ publishing {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`dependencies {`
`64`		`- implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))`
`65`		`-`
`66`	`64`	`api(project(":readium:readium-shared"))`
`67`	`65`
`68`	`66`	`implementation(libs.androidx.core)`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,6 @@ publishing {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`dependencies {`
`65`		`- implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))`
`66`		`-`
`67`	`65`	`api(project(":readium:readium-shared"))`
`68`	`66`	`api(project(":readium:readium-navigator"))`
`69`	`67`	`api(project(":readium:adapters:pdfium:readium-adapter-pdfium-document"))`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,6 @@ publishing {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`dependencies {`
`61`		`- implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))`
`62`		`-`
`63`	`61`	`implementation(libs.kotlinx.coroutines.core)`
`64`	`62`
`65`	`63`	`api(project(":readium:readium-shared"))`