From 349c125d7ebdf1708777fc03d451a4c8cad6f987 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Wed, 5 Jun 2024 20:38:38 +0200 Subject: [PATCH 1/3] Use libzim 9.2.1-1 & libkiwix 13.1.0-3 --- lib/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/build.gradle b/lib/build.gradle index 7ee4a6b..3820dca 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -23,8 +23,8 @@ ext { } // Replace these versions with the latest available versions of libkiwix and libzim -ext.libkiwix_version = "13.1.0-1" -ext.libzim_version = "9.2.1" +ext.libkiwix_version = "13.1.0-3" +ext.libzim_version = "9.2.1-1" apply from: 'publish.gradle' android { From e98bd8bd8c4ac186ccc181aa2734733a8550c499 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Wed, 5 Jun 2024 20:42:49 +0200 Subject: [PATCH 2/3] Use manylinux build in place of bionic --- lib/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/build.gradle b/lib/build.gradle index 3820dca..c937338 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -93,7 +93,7 @@ tasks.register('downloadLibzimSoAndHeaderFiles', Download) { libzim_base_url + 'libzim_android-arm64-' + libzim_version + '.tar.gz', libzim_base_url + 'libzim_android-x86-' + libzim_version + '.tar.gz', libzim_base_url + 'libzim_android-x86_64-' + libzim_version + '.tar.gz', - libzim_base_url + 'libzim_linux-x86_64-bionic-' + libzim_version + '.tar.gz' + libzim_base_url + 'libzim_linux-x86_64-manylinux-' + libzim_version + '.tar.gz' ]) dest buildDir overwrite true @@ -114,7 +114,7 @@ tasks.register('unzipLibzim', Copy) { from tarTree(buildDir.path + "/libzim_android-x86_64-" + libzim_version + ".tar.gz") into buildDir // unzip linux x86_64 - from tarTree(buildDir.path + "/libzim_linux-x86_64-bionic-" + libzim_version + ".tar.gz") + from tarTree(buildDir.path + "/libzim_linux-x86_64-manylinux-" + libzim_version + ".tar.gz") into buildDir } @@ -155,7 +155,7 @@ tasks.register('copyLibzimHeaderAndSoFiles', Copy) { copy { // copying linux_x86_64 so file - from buildDir.path + "/libzim_linux-x86_64-bionic/lib/x86_64-linux-gnu/libzim.so." + getActualLibraryVersion(libzim_version) + from buildDir.path + "/libzim_linux-x86_64-manylinux/lib/x86_64-linux-gnu/libzim.so." + getActualLibraryVersion(libzim_version) into buildDir.path } } From 4747f3a3e5f6f26da43d5e6f544a27abc705c89e Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Thu, 6 Jun 2024 15:34:26 +0530 Subject: [PATCH 3/3] Use linux build in place of manylinux. --- lib/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/build.gradle b/lib/build.gradle index c937338..a6733ba 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -93,7 +93,7 @@ tasks.register('downloadLibzimSoAndHeaderFiles', Download) { libzim_base_url + 'libzim_android-arm64-' + libzim_version + '.tar.gz', libzim_base_url + 'libzim_android-x86-' + libzim_version + '.tar.gz', libzim_base_url + 'libzim_android-x86_64-' + libzim_version + '.tar.gz', - libzim_base_url + 'libzim_linux-x86_64-manylinux-' + libzim_version + '.tar.gz' + libzim_base_url + 'libzim_linux-x86_64-' + libzim_version + '.tar.gz' ]) dest buildDir overwrite true @@ -114,7 +114,7 @@ tasks.register('unzipLibzim', Copy) { from tarTree(buildDir.path + "/libzim_android-x86_64-" + libzim_version + ".tar.gz") into buildDir // unzip linux x86_64 - from tarTree(buildDir.path + "/libzim_linux-x86_64-manylinux-" + libzim_version + ".tar.gz") + from tarTree(buildDir.path + "/libzim_linux-x86_64-" + libzim_version + ".tar.gz") into buildDir } @@ -155,7 +155,7 @@ tasks.register('copyLibzimHeaderAndSoFiles', Copy) { copy { // copying linux_x86_64 so file - from buildDir.path + "/libzim_linux-x86_64-manylinux/lib/x86_64-linux-gnu/libzim.so." + getActualLibraryVersion(libzim_version) + from buildDir.path + "/libzim_linux-x86_64/lib/x86_64-linux-gnu/libzim.so." + getActualLibraryVersion(libzim_version) into buildDir.path } }