From 5ad4e6167abfa4501ba3d69d99c97e1a474c4825 Mon Sep 17 00:00:00 2001
From: MohitMali <futuretechnoworld.mohit@gmail.com>
Date: Fri, 19 Aug 2022 16:55:22 +0530
Subject: [PATCH] Remove JCenter and update kiwixlib

---
 build.gradle.kts                                              | 2 --
 buildSrc/build.gradle.kts                                     | 1 -
 buildSrc/src/main/kotlin/Libs.kt                              | 2 +-
 buildSrc/src/main/kotlin/Versions.kt                          | 4 ++--
 buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt       | 2 --
 core/build.gradle.kts                                         | 3 +--
 .../java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt   | 4 ++--
 7 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6a1fcbec2..22a4f030f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,6 @@ buildscript {
   repositories {
     google()
     mavenCentral()
-    jcenter()
     maven { setUrl("https://jitpack.io") }
   }
   dependencies {
@@ -22,7 +21,6 @@ allprojects {
   repositories {
     google()
     mavenCentral()
-    jcenter()
     maven { setUrl("https://jitpack.io") }
   }
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b4fd8efff..9ee14fbb5 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
 repositories {
   mavenCentral()
   google()
-  jcenter()
   maven {
     setUrl("https://plugins.gradle.org/m2/")
   }
diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
index 5d63fbab0..907a2efe3 100644
--- a/buildSrc/src/main/kotlin/Libs.kt
+++ b/buildSrc/src/main/kotlin/Libs.kt
@@ -378,7 +378,7 @@ object Libs {
   /**
    * https://github.com/kiwix/kiwix-lib
    */
-  const val kiwixlib: String = "org.kiwix.kiwixlib:kiwixlib:" + Versions.kiwixlib
+  const val kiwixlib: String = "com.github.kiwix:java-libkiwix:" + Versions.kiwixlib
 
   /**
    * https://github.com/material-components/material-components-android
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 8303b2026..584d5cdd8 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -72,7 +72,7 @@ object Versions {
 
   const val lint_gradle: String = "27.1.1"
 
-  const val testing_ktx: String = "1.1.2"
+  const val testing_ktx: String = "1.2.0"
 
   const val threetenabp: String = "1.3.0"
 
@@ -88,7 +88,7 @@ object Versions {
 
   const val core_ktx: String = "1.3.2"
 
-  const val kiwixlib: String = "9.4.1"
+  const val kiwixlib: String = "9.4.1-SNAPSHOT"
 
   const val material: String = "1.2.1"
 
diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index 08bf42fd2..b230907e7 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -105,8 +105,6 @@ class AllProjectConfigurer {
           "LabelFor",
           "LogConditional",
           "ConvertToWebp",
-          //TODO remove this when we remove jcenter from gradle
-          "JcenterRepositoryObsolete",
           "UnknownNullness",
           "SelectableText",
           "MissingTranslation",
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 7b4fba8ac..40d9e7f7d 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -4,7 +4,6 @@ buildscript {
   repositories {
     google()
     mavenCentral()
-    jcenter()
     maven { setUrl("https://jitpack.io") }
   }
 
@@ -64,7 +63,7 @@ dependencies {
   if (!shouldUseLocalVersion()) {
     api(Libs.kiwixlib)
   } else {
-    implementation("com.getkeepsafe.relinker:relinker:1.3.1")
+    implementation("com.getkeepsafe.relinker:relinker:1.4.5")
     api(fileTree(mapOf("include" to "*.aar", "dir" to "libs")))
   }
 
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
index d687f5da3..1e80260ed 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
@@ -24,11 +24,11 @@ import android.util.Log
 import androidx.core.net.toUri
 import io.reactivex.Completable
 import io.reactivex.schedulers.Schedulers
+import org.kiwix.kiwixlib.DirectAccessInfo
 import org.kiwix.kiwixlib.JNIKiwixException
 import org.kiwix.kiwixlib.JNIKiwixInt
 import org.kiwix.kiwixlib.JNIKiwixReader
 import org.kiwix.kiwixlib.JNIKiwixString
-import org.kiwix.kiwixlib.Pair
 import org.kiwix.kiwixmobile.core.CoreApp
 import org.kiwix.kiwixmobile.core.NightModeConfig
 import org.kiwix.kiwixmobile.core.entity.LibraryNetworkEntity.Book
@@ -272,5 +272,5 @@ private val String.filePath: String
 val String.truncateMimeType: String
   get() = replace("^([^ ]+).*$", "$1").substringBefore(";")
 
-private val Pair.parcelFileDescriptor: ParcelFileDescriptor?
+private val DirectAccessInfo.parcelFileDescriptor: ParcelFileDescriptor?
   get() = ParcelFileDescriptor.open(File(filename), ParcelFileDescriptor.MODE_READ_ONLY)