NikGapps 3.18__tar.gz → 3.20__tar.gz

{nikgapps-3.18 → nikgapps-3.20}/NikGapps/build/NikGappsManager.py

@@ -117,7 +117,8 @@ class NikGappsManager:
     def create_appset_list(self, package_list, keyword=None, fallback_appset=None):
         appset_dict = {}
         for package in package_list:
-            appset_title = self.find_appset_by_package(package.package_title, keyword=keyword, fallback_appset=fallback_appset)
+            appset_title = self.find_appset_by_package(package.package_title, keyword=keyword,
+                                                       fallback_appset=fallback_appset)
             if appset_title not in appset_dict:
                 appset_dict[appset_title] = AppSet(appset_title, [package])
             else:
@@ -296,8 +297,8 @@ class NikGappsManager:
                 }
             ]
         }
-        return [Overlay(overlay["package_title"], overlay["package_name"], self.android_version, overlay["resources"],
-                        overlay["package_title"]) for overlay
+        return [Overlay(overlay["package_title"], overlay["package_name"], self.android_version, overlay["resources"])
+                for overlay
                 in package_overlays.get(package_name, [])]
 
     def get_go_package(self):

{nikgapps-3.18 → nikgapps-3.20}/NikGapps/helper/Assets.py

@@ -23,7 +23,7 @@ class Assets:
     cwd = assets_folder + os.path.sep
     system_name = platform.system()
     apksigner_path = cwd + "apksigner.jar"
-    apktool_path = cwd + "apktool_2.9.3.jar"
+    apktool_path = cwd + "apktool_2.10.0.jar"
     key_path = cwd + "cert.pk8"
     cert_path = cwd + "cert.x509.pem"
     private_key_pem = cwd + "private_key.pem"

{nikgapps-3.18 → nikgapps-3.20}/NikGapps/overlay_control.py

@@ -4,6 +4,7 @@ from NikGapps.build.NikGappsOverlays import NikGappsOverlays
 from NikGapps.helper.Args import Args
 from NikGapps.helper.Cmd import Cmd
 from NikGapps.helper.FileOp import FileOp
+from NikGapps.helper.P import P
 from NikGapps.helper.Statics import Statics
 from NikGapps.helper.git.Git import Git
 from NikGapps.helper.overlay.Overlay import Overlay
@@ -33,9 +34,12 @@ def overlay_control():
             overlay_repo = Git(overlays_repo_dir)
             overlay_repo.clone_repo(overlays_repo_name, branch="main")
             for folder in Path(repo_dir).iterdir():
-                if str(folder).endswith(".git"):
+                if str(folder).__contains__(".git") or str(folder).__contains__("README.md"):
                     continue
                 cmd = Cmd()
+                if not FileOp.file_exists(os.path.join(str(folder), "apktool.yml")):
+                    P.red(f"apktool.yml doesn't exist in {folder}")
+                    continue
                 overlay_path = cmd.build_overlay(folder_name=str(folder))
                 if not overlay_path.__eq__(""):
                     print(f"{overlay_path} successfully built..")

{nikgapps-3.18 → nikgapps-3.20/NikGapps.egg-info}/PKG-INFO

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

{nikgapps-3.18 → nikgapps-3.20}/NikGapps.egg-info/SOURCES.txt

@@ -45,6 +45,7 @@ NikGapps/helper/__init__.py
 NikGapps/helper/assets/NikGappsZipSigner.jar
 NikGapps/helper/assets/addon.sh
 NikGapps/helper/assets/apksigner.jar
+NikGapps/helper/assets/apktool_2.10.0.jar
 NikGapps/helper/assets/apktool_2.9.3.jar
 NikGapps/helper/assets/appsets.json
 NikGapps/helper/assets/busybox

{nikgapps-3.18/NikGapps.egg-info → nikgapps-3.20}/PKG-INFO

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

{nikgapps-3.18 → nikgapps-3.20}/setup.py

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