From 3a3f413c873fff20c43ae9105ffaa2d04fcf0ab3 Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Fri, 7 Jun 2024 12:48:06 +0530 Subject: [PATCH 1/2] Use java-libkiwix 2.2.0 --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 68aec18d3..715caa47b 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -86,7 +86,7 @@ object Versions { const val core_ktx: String = "1.9.0" - const val libkiwix: String = "2.1.1" + const val libkiwix: String = "2.2.0" const val material: String = "1.8.0" From 1bff4b9efa47f9853d7001880bea0909ab2fc01b Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Fri, 7 Jun 2024 13:07:06 +0530 Subject: [PATCH 2/2] Fixed the compilation errors due to the new java-libkiwix. --- core/build.gradle.kts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index fbf4af75f..61fa4bef8 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -56,7 +56,10 @@ dependencies { // Get kiwixlib online if it is not populated locally if (!shouldUseLocalVersion()) { - api(Libs.libkiwix) + api(Libs.libkiwix) { + // TODO Should be removed after we upgrade to the SDK 34 + exclude("org.jetbrains.kotlin", "kotlin-stdlib") + } } else { implementation("com.getkeepsafe.relinker:relinker:1.4.5") api(fileTree(mapOf("include" to "*.aar", "dir" to "libs")))