kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-08 14:52:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove JCenter and update kiwixlib

Browse Source
This commit is contained in:
MohitMali 2022-08-19 16:55:22 +05:30
parent f719601867
commit 5ad4e6167a
7 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -2,7 +2,6 @@ buildscript {
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
jcenter()
maven { setUrl("https://jitpack.io") } maven { setUrl("https://jitpack.io") }
} }
dependencies { dependencies {
@ -22,7 +21,6 @@ allprojects {
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
jcenter()
maven { setUrl("https://jitpack.io") } maven { setUrl("https://jitpack.io") }
} }
} }

1
buildSrc/build.gradle.kts
View File

@ -4,7 +4,6 @@ plugins {
repositories { repositories {
mavenCentral() mavenCentral()
google() google()
jcenter()
maven { maven {
setUrl("https://plugins.gradle.org/m2/") setUrl("https://plugins.gradle.org/m2/")
} }

2
buildSrc/src/main/kotlin/Libs.kt
View File

@ -378,7 +378,7 @@ object Libs {
/** /**
* https://github.com/kiwix/kiwix-lib * 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 * https://github.com/material-components/material-components-android

4
buildSrc/src/main/kotlin/Versions.kt
View File

@ -72,7 +72,7 @@ object Versions {
const val lint_gradle: String = "27.1.1" 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" const val threetenabp: String = "1.3.0"
@ -88,7 +88,7 @@ object Versions {
const val core_ktx: String = "1.3.2" 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" const val material: String = "1.2.1"

2
buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
View File

@ -105,8 +105,6 @@ class AllProjectConfigurer {
"LabelFor", "LabelFor",
"LogConditional", "LogConditional",
"ConvertToWebp", "ConvertToWebp",
//TODO remove this when we remove jcenter from gradle
"JcenterRepositoryObsolete",
"UnknownNullness", "UnknownNullness",
"SelectableText", "SelectableText",
"MissingTranslation", "MissingTranslation",

3
core/build.gradle.kts
View File

@ -4,7 +4,6 @@ buildscript {
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
jcenter()
maven { setUrl("https://jitpack.io") } maven { setUrl("https://jitpack.io") }
} }
@ -64,7 +63,7 @@ dependencies {
if (!shouldUseLocalVersion()) { if (!shouldUseLocalVersion()) {
api(Libs.kiwixlib) api(Libs.kiwixlib)
} else { } 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"))) api(fileTree(mapOf("include" to "*.aar", "dir" to "libs")))
} }

4
core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
View File

@ -24,11 +24,11 @@ import android.util.Log
import androidx.core.net.toUri import androidx.core.net.toUri
import io.reactivex.Completable import io.reactivex.Completable
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import org.kiwix.kiwixlib.DirectAccessInfo
import org.kiwix.kiwixlib.JNIKiwixException import org.kiwix.kiwixlib.JNIKiwixException
import org.kiwix.kiwixlib.JNIKiwixInt import org.kiwix.kiwixlib.JNIKiwixInt
import org.kiwix.kiwixlib.JNIKiwixReader import org.kiwix.kiwixlib.JNIKiwixReader
import org.kiwix.kiwixlib.JNIKiwixString import org.kiwix.kiwixlib.JNIKiwixString
import org.kiwix.kiwixlib.Pair
import org.kiwix.kiwixmobile.core.CoreApp import org.kiwix.kiwixmobile.core.CoreApp
import org.kiwix.kiwixmobile.core.NightModeConfig import org.kiwix.kiwixmobile.core.NightModeConfig
import org.kiwix.kiwixmobile.core.entity.LibraryNetworkEntity.Book import org.kiwix.kiwixmobile.core.entity.LibraryNetworkEntity.Book
@ -272,5 +272,5 @@ private val String.filePath: String
val String.truncateMimeType: String val String.truncateMimeType: String
get() = replace("^([^ ]+).*$", "$1").substringBefore(";") get() = replace("^([^ ]+).*$", "$1").substringBefore(";")
private val Pair.parcelFileDescriptor: ParcelFileDescriptor? private val DirectAccessInfo.parcelFileDescriptor: ParcelFileDescriptor?
get() = ParcelFileDescriptor.open(File(filename), ParcelFileDescriptor.MODE_READ_ONLY) get() = ParcelFileDescriptor.open(File(filename), ParcelFileDescriptor.MODE_READ_ONLY)