NikGapps 3.43__tar.gz → 3.45__tar.gz

{nikgapps-3.43 → nikgapps-3.45}/NikGapps/build/NikGappsManager.py

@@ -492,13 +492,13 @@ class NikGappsManager:
         # if float(self.android_version) == 13:
         #     addon_packages.append("PixelWallpapers")
         pixel_setup_wizard_packages = [
-            "SetupWizard",
-            "GoogleRestore",
+            "SetupWizardPixel",
+            "GoogleRestorePixel",
             "PixelSetupWizard",
-            "GoogleOneTimeInitializer"
+            "GoogleOneTimeInitializerPixel"
         ]
         if float(self.android_version) < 12:
-            pixel_setup_wizard_packages.append("AndroidMigratePrebuilt")
+            pixel_setup_wizard_packages.append("AndroidMigratePixelPrebuilt")
         pixel_setup_wizard = self.create_appset_list_from_packages(pixel_setup_wizard_packages, keyword="Pixel")
         addon_set_list = pixel_setup_wizard + self.create_appset_list_from_packages(addon_packages)
         if addon_name:

{nikgapps-3.43 → nikgapps-3.45}/NikGapps/helper/assets/appsets.json

@@ -359,16 +359,16 @@
     {
       "min_version": 10,
       "packages": [
-        "SetupWizard",
-        "GoogleRestore",
-        "GoogleOneTimeInitializer",
+        "SetupWizardPixel",
+        "GoogleRestorePixel",
+        "GoogleOneTimeInitializerPixel",
         "PixelSetupWizard"
       ]
     },
     {
       "max_version": 12,
       "packages": [
-        "AndroidMigratePrebuilt"
+        "AndroidMigratePixelPrebuilt"
       ]
     }
   ],

{nikgapps-3.43 → nikgapps-3.45}/NikGapps/helper/assets/changelogs.yaml

@@ -1,9 +1,10 @@
 - date: 4th Nov 2024 (Android 10-15)
   changes:
-      - item: Initial Android 15 beta Release
+      - item: Initial Android 15 stable Release
       - item: Added overlays for Google Sounds, Device Setup, Google Wallpaper, Google Files
       - item: Added AICore in PixelSpecifics (Android 15)
       - item: Updated gms overlay to adapt android 15
+      - item: Make the PixelSetupWizard independent of SetupWizard appsets for simplicity
       - item: Updated nikgapps.config to v36
 - date: 13th Aug 2024 (Android 10-14)
   changes:

nikgapps-3.45/NikGapps/helper/assets/config_versions.json

@@ -0,0 +1,9 @@
+{
+  "10": "36",
+  "11": "36",
+  "12": "36",
+  "12.1": "36",
+  "13": "36",
+  "14": "36",
+  "15": "36"
+}

{nikgapps-3.43 → nikgapps-3.45}/NikGapps/helper/assets/packages.json

@@ -23,6 +23,14 @@
             "type": "priv-app"
         }
     ],
+    "AndroidMigratePixelPrebuilt": [
+        {
+            "package_name": "com.google.android.apps.pixelmigrate",
+            "partition": "product",
+            "title": "AndroidMigratePrebuilt",
+            "type": "priv-app"
+        }
+    ],
     "Assistant": [
         {
             "package_name": "com.google.android.apps.googleassistant",
@@ -317,6 +325,14 @@
             "type": "priv-app"
         }
     ],
+    "GoogleOneTimeInitializerPixel": [
+        {
+            "package_name": "com.google.android.onetimeinitializer",
+            "partition": "product",
+            "title": "GoogleOneTimeInitializer",
+            "type": "priv-app"
+        }
+    ],
     "GooglePartnerSetup": [
         {
             "package_name": "com.google.android.partnersetup",
@@ -357,6 +373,14 @@
             "type": "priv-app"
         }
     ],
+    "GoogleRestorePixel": [
+        {
+            "package_name": "com.google.android.apps.restore",
+            "partition": "product",
+            "title": "GoogleRestorePrebuilt",
+            "type": "priv-app"
+        }
+    ],
     "GoogleServicesFramework": [
         {
             "package_name": "com.google.android.gsf",
@@ -555,6 +579,14 @@
             "type": "priv-app"
         }
     ],
+    "SetupWizardPixel": [
+        {
+            "package_name": "com.google.android.setupwizard",
+            "partition": "product",
+            "title": "SetupWizardPrebuilt",
+            "type": "priv-app"
+        }
+    ],
     "StorageManager": [
         {
             "package_name": "com.google.android.storagemanager",

{nikgapps-3.43 → nikgapps-3.45}/NikGapps/helper/compression/Export.py

@@ -35,7 +35,7 @@ class Export:
         completed_packages = 0
         file_sizes = ""
         zip_execution_status = False
-        telegram.message(f"Progress {0:.2f}% ({completed_packages}/{total_packages})")
+        telegram.message(f"- Gapps is building {0:.2f}% ({completed_packages}/{total_packages})")
 
         def compress_and_add_file(appset, pakg, compressionmode):
             nonlocal completed_packages
@@ -70,9 +70,9 @@ class Export:
                 file_sizes = file_sizes + str(pakg.package_title) + "=" + str(pakg.pkg_size) + "\n"
                 completed_packages += 1
                 progress = (completed_packages / total_packages) * 100
-                telegram.message(f"Progress {progress:.2f}% ({completed_packages}/{total_packages})",
+                telegram.message(f"- Gapps is building {progress:.2f}% ({completed_packages}/{total_packages})",
                                  replace_last_message=True)
-                P.blue(f"Progress {progress:.2f}% ({completed_packages}/{total_packages}): "
+                P.blue(f"- Gapps is building {progress:.2f}% ({completed_packages}/{total_packages}): "
                        f"{appset.title}/{pakg.package_title} (Thread {thread_id})")
 
         with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:

{nikgapps-3.43 → nikgapps-3.45}/NikGapps/main.py

@@ -43,7 +43,8 @@ def main():
                 apk_repo = GitOp.clone_apk_source(android_version, args.arch, release_type=Config.RELEASE_TYPE)
                 Config.APK_SOURCE = apk_repo.working_tree_dir
                 overlay_repo = GitOp.clone_overlay_repo(android_version)
-                Config.OVERLAY_SOURCE = overlay_repo.working_tree_dir
+                if overlay_repo is not None:
+                    Config.OVERLAY_SOURCE = overlay_repo.working_tree_dir
         if Config.OVERRIDE_RELEASE:
             Release.zip(package_list, android_version, args.arch, args.sign)
         if Config.RELEASE_TYPE and Config.ENVIRONMENT_TYPE == "production":

{nikgapps-3.43 → nikgapps-3.45/NikGapps.egg-info}/PKG-INFO

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

{nikgapps-3.43/NikGapps.egg-info → nikgapps-3.45}/PKG-INFO

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

{nikgapps-3.43 → nikgapps-3.45}/setup.py

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

nikgapps-3.43/NikGapps/helper/assets/config_versions.json

@@ -1,9 +0,0 @@
-{
-  "10": "35",
-  "11": "35",
-  "12": "35",
-  "12.1": "35",
-  "13": "35",
-  "14": "35",
-  "15": "35"
-}