NikGapps 3.97__tar.gz → 3.99__tar.gz

{nikgapps-3.97 → nikgapps-3.99}/NikGapps/helper/overlay/ApkMetaInfo.py

@@ -7,10 +7,10 @@ from niklibrary.helper.Statics import Statics
 class ApkMetaInfo:
     def __init__(self, apk_file_name, android_version):
         self.apkFileName = apk_file_name
-        self.minSdkVersion = Statics.get_android_sdk(android_version)
+        self.minSdkVersion = int(Statics.get_android_sdk(android_version))
         self.targetSdkVersion = self.minSdkVersion
         self.versionCode = self.minSdkVersion
-        self.versionName = android_version
+        self.versionName = str(android_version)
 
     def to_dict(self):
         return {
@@ -19,8 +19,8 @@ class ApkMetaInfo:
             'compressionType': False,
             'doNotCompress': ['resources.arsc'],
             'isFrameworkApk': False,
-            'packageInfo': {
-                'forcedPackageId': '127',
+            'resourcesInfo': {
+                'packageId': 127,
                 'renameManifestPackage': None,
             },
             'sdkInfo': {
@@ -34,7 +34,7 @@ class ApkMetaInfo:
                 'ids': [1],
                 'tag': None,
             },
-            'version': '1.0.0',
+            'version': '3.0.2',
             'versionInfo': {
                 'versionCode': self.versionCode,
                 'versionName': self.versionName,

{nikgapps-3.97 → nikgapps-3.99/NikGapps.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NikGapps
-Version: 3.97
+Version: 3.99
 Summary: A short description of your project
 Home-page: https://github.com/nikgapps/project
 Author: Nikhil Menghani
@@ -11,18 +11,18 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: colorama~=0.4.6
-Requires-Dist: pytz~=2025.2
-Requires-Dist: requests~=2.32.5
+Requires-Dist: pytz~=2026.4
+Requires-Dist: requests~=2.34.2
 Requires-Dist: PyYAML~=6.0.3
 Requires-Dist: psutil~=7.2.2
-Requires-Dist: setuptools~=82.0.0
+Requires-Dist: setuptools~=84.0.0
 Requires-Dist: pexpect~=4.9.0
-Requires-Dist: GitPython~=3.1.45
-Requires-Dist: PyGithub~=2.8.1
-Requires-Dist: python-gitlab~=8.0.0
-Requires-Dist: cryptography~=46.0.3
-Requires-Dist: python-dotenv~=1.2.1
-Requires-Dist: niklibrary~=0.56
+Requires-Dist: GitPython~=3.1.62
+Requires-Dist: PyGithub~=2.10.0
+Requires-Dist: python-gitlab~=8.6.0
+Requires-Dist: cryptography~=50.0.1
+Requires-Dist: python-dotenv~=1.2.3
+Requires-Dist: niklibrary~=0.58
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{nikgapps-3.97 → nikgapps-3.99}/NikGapps.egg-info/SOURCES.txt

@@ -83,6 +83,7 @@ nikgapps_registry/__init__.py
 nikgapps_registry/__main__.py
 nikgapps_registry/cli.py
 nikgapps_registry/service.py
+tests/test_apk_meta_info.py
 tests_package_pipeline/__init__.py
 tests_package_pipeline/test_consumer.py
 tests_package_pipeline/test_overlay_control.py

nikgapps-3.99/NikGapps.egg-info/requires.txt

@@ -0,0 +1,13 @@
+colorama~=0.4.6
+pytz~=2026.4
+requests~=2.34.2
+PyYAML~=6.0.3
+psutil~=7.2.2
+setuptools~=84.0.0
+pexpect~=4.9.0
+GitPython~=3.1.62
+PyGithub~=2.10.0
+python-gitlab~=8.6.0
+cryptography~=50.0.1
+python-dotenv~=1.2.3
+niklibrary~=0.58

{nikgapps-3.97/NikGapps.egg-info → nikgapps-3.99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NikGapps
-Version: 3.97
+Version: 3.99
 Summary: A short description of your project
 Home-page: https://github.com/nikgapps/project
 Author: Nikhil Menghani
@@ -11,18 +11,18 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: colorama~=0.4.6
-Requires-Dist: pytz~=2025.2
-Requires-Dist: requests~=2.32.5
+Requires-Dist: pytz~=2026.4
+Requires-Dist: requests~=2.34.2
 Requires-Dist: PyYAML~=6.0.3
 Requires-Dist: psutil~=7.2.2
-Requires-Dist: setuptools~=82.0.0
+Requires-Dist: setuptools~=84.0.0
 Requires-Dist: pexpect~=4.9.0
-Requires-Dist: GitPython~=3.1.45
-Requires-Dist: PyGithub~=2.8.1
-Requires-Dist: python-gitlab~=8.0.0
-Requires-Dist: cryptography~=46.0.3
-Requires-Dist: python-dotenv~=1.2.1
-Requires-Dist: niklibrary~=0.56
+Requires-Dist: GitPython~=3.1.62
+Requires-Dist: PyGithub~=2.10.0
+Requires-Dist: python-gitlab~=8.6.0
+Requires-Dist: cryptography~=50.0.1
+Requires-Dist: python-dotenv~=1.2.3
+Requires-Dist: niklibrary~=0.58
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{nikgapps-3.97 → nikgapps-3.99}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="NikGapps",
-    version="3.97",
+    version="3.99",
     packages=find_packages(),
     include_package_data=True,
     package_data={
@@ -17,18 +17,18 @@ setup(
     url="https://github.com/nikgapps/project",
     install_requires=[
         'colorama~=0.4.6',
-        'pytz~=2025.2',
-        'requests~=2.32.5',
+        'pytz~=2026.4',
+        'requests~=2.34.2',
         'PyYAML~=6.0.3',
         'psutil~=7.2.2',
-        'setuptools~=82.0.0',
+        'setuptools~=84.0.0',
         'pexpect~=4.9.0',
-        'GitPython~=3.1.45',
-        'PyGithub~=2.8.1',
-        'python-gitlab~=8.0.0',
-        'cryptography~=46.0.3',
-        'python-dotenv~=1.2.1',
-        'niklibrary~=0.56'
+        'GitPython~=3.1.62',
+        'PyGithub~=2.10.0',
+        'python-gitlab~=8.6.0',
+        'cryptography~=50.0.1',
+        'python-dotenv~=1.2.3',
+        'niklibrary~=0.58'
     ],
     entry_points={
         'console_scripts': [

nikgapps-3.99/tests/test_apk_meta_info.py

@@ -0,0 +1,46 @@
+import tempfile
+import unittest
+from pathlib import Path
+
+import yaml
+
+from NikGapps.helper.overlay.ApkMetaInfo import ApkMetaInfo
+from niklibrary.helper.Statics import Statics
+
+
+class ApkMetaInfoTests(unittest.TestCase):
+    def setUp(self):
+        self.original_android_17 = Statics.android_versions.get("17")
+        Statics.android_versions["17"] = {"sdk": "37", "code": "CinnamonBun"}
+
+    def tearDown(self):
+        if self.original_android_17 is None:
+            Statics.android_versions.pop("17", None)
+        else:
+            Statics.android_versions["17"] = self.original_android_17
+
+    def test_apktool_3_metadata_uses_numeric_sdk_fields(self):
+        metadata = ApkMetaInfo("ExampleOverlay.apk", "17").to_dict()
+
+        self.assertEqual(37, metadata["sdkInfo"]["minSdkVersion"])
+        self.assertEqual(37, metadata["sdkInfo"]["targetSdkVersion"])
+        self.assertEqual(37, metadata["versionInfo"]["versionCode"])
+        self.assertEqual(
+            {"packageId": 127, "renameManifestPackage": None},
+            metadata["resourcesInfo"],
+        )
+        self.assertNotIn("packageInfo", metadata)
+
+    def test_written_metadata_round_trips_numbers_as_numbers(self):
+        with tempfile.TemporaryDirectory() as directory:
+            ApkMetaInfo("ExampleOverlay.apk", "17").write(directory, "apktool.yml")
+            metadata = yaml.safe_load(
+                Path(directory, "apktool.yml").read_text(encoding="utf-8")
+            )
+
+        self.assertIsInstance(metadata["sdkInfo"]["minSdkVersion"], int)
+        self.assertIsInstance(metadata["versionInfo"]["versionCode"], int)
+
+
+if __name__ == "__main__":
+    unittest.main()

nikgapps-3.97/NikGapps.egg-info/requires.txt

@@ -1,13 +0,0 @@
-colorama~=0.4.6
-pytz~=2025.2
-requests~=2.32.5
-PyYAML~=6.0.3
-psutil~=7.2.2
-setuptools~=82.0.0
-pexpect~=4.9.0
-GitPython~=3.1.45
-PyGithub~=2.8.1
-python-gitlab~=8.0.0
-cryptography~=46.0.3
-python-dotenv~=1.2.1
-niklibrary~=0.56