Removed dependency from date for copying the .so and headers files of (libkiwix, libzim) , Now we are renameing the folders names via renameFolders method

Author: MohitMaliFtechiz

install_deps.sh

@@ -15,13 +15,13 @@ printf "${Green}Downloading libzim ${NC}\n"
 printf  "\n${Green}Done! ${NC}\n"
 
 printf "${Green}Coping libzim header and so files ${NC}\n"
-./gradlew checkCurrentLibzimDate checkCurrentLinuxLibzimDate copyLibzimHeaderAndSoFiles renameLibzimSoFile
+./gradlew renameLibzimFolders copyLibzimHeaderAndSoFiles renameLibzimSoFile
 printf  "\n${Green}Down! ${NC}\n"
 
 printf "${Green}Downloading libkiwix ${NC}\n"
 ./gradlew downloadLibkiwixSoAndHeaderFiles unzipLibkiwix
 printf  "\n${Green}Done! ${NC}\n"
 
 printf "${Green}Coping libkiwix header and so files ${NC}\n"
-./gradlew checkCurrentLibkiwixDate checkCurrentLinuxLibkiwixDate copyLibkiwixHeaderAndSoFiles renameLibkiwixSoFile
+./gradlew renameLibkiwixFolders copyLibkiwixHeaderAndSoFiles renameLibkiwixSoFile
 printf  "\n${Green}Done! ${NC}\n"

lib/build.gradle

@@ -68,6 +68,12 @@ android {
     }
     ndkVersion '21.4.7075529'
 
+    configurations {
+        testCompileClasspath.extendsFrom(compileClasspath)
+        testRuntimeClasspath.extendsFrom(testCompileClasspath)
+        testImplementation.extendsFrom(implementation)
+        testRuntimeOnly.extendsFrom(runtimeOnly)
+    }
 }
 
 dependencies {
@@ -80,11 +86,6 @@ ext.libzim_base_url = 'https://download.openzim.org/nightly'
 // temporary url for libzim linux variant zim file, Once https://github.com/openzim/libzim/issues/772 fixed, then we can remove this
 ext.linux_libzim_base_url = 'https://download.openzim.org/nightly/2023-03-20'
 
-ext.nightly_date_for_libkiwix = project.properties["nightly_date_for_libkiwix"] ?: ""
-ext.nightly_date_for_libkiwix_linux = project.properties["nightly_date_for_libkiwix_linux"] ?: ""
-ext.nightly_date_for_libzim = project.properties["nightly_date_for_libzim"] ?: ""
-ext.nightly_date_for_libzim_linux = project.properties["nightly_date_for_libzim_linux"] ?: ""
-
 ext.libkiwix_version = project.properties["libkiwix_version"] ?: ""
 ext.libzim_version = project.properties["libzim_version"] ?: ""
 
@@ -100,14 +101,6 @@ task downloadLibzimSoAndHeaderFiles(type: Download) {
     overwrite true
 }
 
-task checkCurrentLibzimDate() {
-    project.ext.set("nightly_date_for_libzim", getDateFromPath(buildDir.path, "libzim_android-arm64-"))
-}
-
-task checkCurrentLinuxLibzimDate() {
-    project.ext.set("nightly_date_for_libzim_linux", getDateFromPath(buildDir.path, "libzim_linux-x86_64-"))
-}
-
 task unzipLibzim(type: Copy) {
     // unzip android arm
     from tarTree(buildDir.path + "/libzim_android-arm.tar.gz")
@@ -126,41 +119,45 @@ task unzipLibzim(type: Copy) {
     into buildDir
 }
 
+task renameLibzimFolders() {
+    renameFolders(buildDir.path,"libzim_")
+}
+
 task copyLibzimHeaderAndSoFiles(type: Copy) {
     copy {
         // copying header file
-        from buildDir.path + "/libzim_android-arm-" + nightly_date_for_libzim + '/include/'
+        from buildDir.path + "/libzim_android-arm/include/"
         into buildDir.path + "/include/libzim/"
     }
 
     copy {
         // copying android_arm so file
-        from buildDir.path + "/libzim_android-arm-" + nightly_date_for_libzim + '/lib/arm-linux-androideabi/'
+        from buildDir.path + "/libzim_android-arm/lib/arm-linux-androideabi/"
         into buildDir.path + "/jniLibs/armeabi-v7a/libzim/"
     }
 
     copy {
         // copying android_arm64 so file
-        from buildDir.path + "/libzim_android-arm64-" + nightly_date_for_libzim + '/lib/aarch64-linux-android/'
+        from buildDir.path + "/libzim_android-arm64/lib/aarch64-linux-android/"
         into buildDir.path + "/jniLibs/arm64-v8a/libzim/"
     }
 
     copy {
         // copying android_x86 so file
-        from buildDir.path + "/libzim_android-x86-" + nightly_date_for_libzim + '/lib/i686-linux-android/'
+        from buildDir.path + "/libzim_android-x86/lib/i686-linux-android/"
         into buildDir.path + "/jniLibs/x86/libzim/"
     }
 
     copy {
         // copying android_x86_64 so file
-        from buildDir.path + "/libzim_android-x86_64-" + nightly_date_for_libzim + '/lib/x86_64-linux-android/'
+        from buildDir.path + "/libzim_android-x86_64/lib/x86_64-linux-android/"
         into buildDir.path + "/jniLibs/x86_64/libzim/"
     }
 
     copy {
         // copying linux_x86_64 so file
-        project.ext.set("libzim_version", getFileFromFolder(buildDir.path + "/libzim_linux-x86_64-" + nightly_date_for_libzim_linux + "/lib/x86_64-linux-gnu/"))
-        from buildDir.path + "/libzim_linux-x86_64-" + nightly_date_for_libzim_linux + "/lib/x86_64-linux-gnu/" + libzim_version
+        project.ext.set("libzim_version", getFileFromFolder(buildDir.path + "/libzim_linux-x86_64/lib/x86_64-linux-gnu/"))
+        from buildDir.path + "/libzim_linux-x86_64/lib/x86_64-linux-gnu/" + libzim_version
         into buildDir.path
     }
 }
@@ -186,22 +183,20 @@ task downloadLibkiwixSoAndHeaderFiles(type: Download) {
     overwrite true
 }
 
-task checkCurrentLibkiwixDate() {
-    project.ext.set("nightly_date_for_libkiwix", getDateFromPath(buildDir.path, "libkiwix_android-arm64-"))
+task renameLibkiwixFolders() {
+    renameFolders(buildDir.path,"libkiwix_")
 }
 
-task checkCurrentLinuxLibkiwixDate() {
-    project.ext.set("nightly_date_for_libkiwix_linux", getDateFromPath(buildDir.path, "libkiwix_linux-x86_64-"))
-}
-
-static String getDateFromPath(String path, String matchesString) {
-    File folder = new File(path)
-    if (folder.exists()) {
-        return folder.listFiles()
-                .stream()
-                .filter(f -> f.name.startsWith(matchesString))
-                .map(s -> s.name.replace(matchesString, ""))
-                .collect(Collectors.toList())[0]
+static void renameFolders(String path, String startWith) {
+    File directory = new File(path)
+    if (directory.exists() && directory.isDirectory()) {
+        Arrays.stream(directory.listFiles())
+                .filter(folder -> folder.isDirectory() && folder.getName().startsWith(startWith))
+                .forEach(file -> {
+                    String newName = file.getName().replaceAll("-\\d{4}-\\d{2}-\\d{2}", "")
+                    File newFile = new File(directory, newName)
+                    file.renameTo(newFile)
+                })
     }
 }
 
@@ -226,38 +221,38 @@ task unzipLibkiwix(type: Copy) {
 task copyLibkiwixHeaderAndSoFiles(type: Copy) {
     copy {
         // copying header file
-        from buildDir.path + "/libkiwix_android-arm-" + nightly_date_for_libkiwix + '/include/kiwix/'
+        from buildDir.path + "/libkiwix_android-arm/include/kiwix/"
         into buildDir.path + "/include/libkiwix/"
     }
 
     copy {
         // copying android_arm so file
-        from buildDir.path + "/libkiwix_android-arm-" + nightly_date_for_libkiwix + '/lib/arm-linux-androideabi/'
+        from buildDir.path + "/libkiwix_android-arm/lib/arm-linux-androideabi/"
         into buildDir.path + "/jniLibs/armeabi-v7a/libkiwix/"
     }
 
     copy {
         // copying android_arm64 so file
-        from buildDir.path + "/libkiwix_android-arm64-" + nightly_date_for_libkiwix + '/lib/aarch64-linux-android/'
+        from buildDir.path + "/libkiwix_android-arm64/lib/aarch64-linux-android/"
         into buildDir.path + "/jniLibs/arm64-v8a/libkiwix/"
     }
 
     copy {
         // copying android_x86 so file
-        from buildDir.path + "/libkiwix_android-x86-" + nightly_date_for_libkiwix + '/lib/i686-linux-android/'
+        from buildDir.path + "/libkiwix_android-x86/lib/i686-linux-android/"
         into buildDir.path + "/jniLibs/x86/libkiwix/"
     }
 
     copy {
         // copying android_x86_64 so file
-        from buildDir.path + "/libkiwix_android-x86_64-" + nightly_date_for_libkiwix + '/lib/x86_64-linux-android/'
+        from buildDir.path + "/libkiwix_android-x86_64/lib/x86_64-linux-android/"
         into buildDir.path + "/jniLibs/x86_64/libkiwix/"
     }
 
     copy {
         // copying linux_x86_64 so file
-        project.ext.set("libkiwix_version", getFileFromFolder(buildDir.path + "/libkiwix_linux-x86_64-" + nightly_date_for_libkiwix_linux + "/lib/x86_64-linux-gnu/"))
-        from buildDir.path + "/libkiwix_linux-x86_64-" + nightly_date_for_libkiwix_linux + "/lib/x86_64-linux-gnu/" + libkiwix_version
+        project.ext.set("libkiwix_version", getFileFromFolder(buildDir.path + "/libkiwix_linux-x86_64/lib/x86_64-linux-gnu/"))
+        from buildDir.path + "/libkiwix_linux-x86_64/lib/x86_64-linux-gnu/" + libkiwix_version
         into buildDir.path
     }
 }