NikGapps 3.7__tar.gz → 3.9__tar.gz

{nikgapps-3.7 → nikgapps-3.9}/NikGapps/build/Build.py

@@ -38,15 +38,16 @@ class Build:
                 primary_app_location = None
                 delete_files_list = []
                 delete_overlay_list = []
-                overlay_directory = Config.OVERLAY_SOURCE
-                overlay_dir = overlay_directory + Statics.dir_sep + f"{package_title}Overlay"
-                if FileOp.dir_exists(overlay_dir):
-                    for file in Path(overlay_dir).rglob("*.apk"):
-                        pkg_files_path = "overlay" + Statics.dir_sep + Path(file).name
-                        install_list.append(pkg_files_path.replace("___", "/"))
-                        file_dict_value = str(pkg_files_path.replace("___", "/")).replace("\\", "/")
-                        value = str(file_dict_value).split("/")
-                        file_dict[str(file)] = "___" + "___".join(value[:len(value) - 1]) + "/" + value[len(value) - 1]
+                if android_version >= 12.1:
+                    overlay_directory = Config.OVERLAY_SOURCE
+                    overlay_dir = overlay_directory + Statics.dir_sep + f"{package_title}Overlay"
+                    if FileOp.dir_exists(overlay_dir):
+                        for file in Path(overlay_dir).rglob("*.apk"):
+                            pkg_files_path = "overlay" + Statics.dir_sep + Path(file).name
+                            install_list.append(pkg_files_path.replace("___", "/"))
+                            file_dict_value = str(pkg_files_path.replace("___", "/")).replace("\\", "/")
+                            value = str(file_dict_value).split("/")
+                            file_dict[str(file)] = "___" + "___".join(value[:len(value) - 1]) + "/" + value[len(value) - 1]
                 for pkg_files in Path(pkg_path).rglob("*"):
                     if Path(pkg_files).is_dir() or str(pkg_files).__contains__(".git") \
                             or str(pkg_files).endswith(".gitattributes") or str(pkg_files).endswith("README.md"):

{nikgapps-3.7 → nikgapps-3.9}/NikGapps/cache.py

@@ -41,11 +41,12 @@ def cache():
             gitattributes = """*.zip filter=lfs diff=lfs merge=lfs -text
 *.tar.xz filter=lfs diff=lfs merge=lfs -text"""
             gitlab_manager.reset_repository(cached_url, sleep_for=10, gitattributes=gitattributes)
-        repo_cached = GitOperations.clone_apk_url(url=cached_url)
+        repo_cached = GitOperations.clone_apk_url(url=cached_url, use_ssh_clone=True)
         apk_repo = GitOperations.clone_apk_url(url=url)
         Config.APK_SOURCE = apk_repo.working_tree_dir
-        overlay_repo = GitOperations.clone_overlay_repo(android_version=str(android_version), fresh_clone=True)
-        Config.OVERLAY_SOURCE = overlay_repo.working_tree_dir
+        if android_version >= 12.1:
+            overlay_repo = GitOperations.clone_overlay_repo(android_version=str(android_version), fresh_clone=True)
+            Config.OVERLAY_SOURCE = overlay_repo.working_tree_dir
         config_obj = NikGappsConfig(android_version)
         app_set_list = config_obj.package_manager.get_packages("all")
         config_obj.config_package_list = Build.build_from_directory(app_set_list, android_version)

{nikgapps-3.7 → nikgapps-3.9}/NikGapps/helper/git/GitOperations.py

@@ -39,7 +39,7 @@ class GitOperations:
         arch = "" if arch == "arm64" else "_" + arch
         cache = "_cached" if cached else ""
         apk_source_directory = Statics.pwd + Statics.dir_sep + str(android_version) + arch + cache
-        apk_source_repo = GitStatics.apk_source_repo_ssh if use_ssh_clone else GitStatics.apk_source_repo + str(
+        apk_source_repo = (GitStatics.apk_source_repo_ssh if use_ssh_clone else GitStatics.apk_source_repo) + str(
             android_version) + arch + cache + ".git"
         return GitOperations.setup_repo(apk_source_directory, apk_source_repo, branch, fresh_clone, commit_depth=1)
 
@@ -54,7 +54,8 @@ class GitOperations:
     @staticmethod
     def clone_apk_url(url, fresh_clone=False, use_ssh_clone=False):
         apk_source_directory = Statics.pwd + Statics.dir_sep + url
-        apk_source_repo = GitStatics.apk_source_repo_ssh if use_ssh_clone else GitStatics.apk_source_repo + url + ".git"
+        apk_source_repo = ((GitStatics.apk_source_repo_ssh if use_ssh_clone else GitStatics.apk_source_repo) + url
+                           + ".git")
         return GitOperations.setup_repo(apk_source_directory, apk_source_repo, branch="main", fresh_clone=fresh_clone,
                                         commit_depth=1)
 

{nikgapps-3.7 → nikgapps-3.9/NikGapps.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NikGapps
-Version: 3.7
+Version: 3.9
 Summary: A short description of your project
 Home-page: https://github.com/nikgapps/project
 Author: Nikhil Menghani

{nikgapps-3.7/NikGapps.egg-info → nikgapps-3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NikGapps
-Version: 3.7
+Version: 3.9
 Summary: A short description of your project
 Home-page: https://github.com/nikgapps/project
 Author: Nikhil Menghani

{nikgapps-3.7 → nikgapps-3.9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="NikGapps",
-version="3.7",
+version="3.9",
     packages=find_packages(),
     include_package_data=True,
     package_data={