NikGapps 3.42__tar.gz → 3.44__tar.gz

{nikgapps-3.42 → nikgapps-3.44}/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.42 → nikgapps-3.44}/NikGapps/copy_repos.py

@@ -1,21 +1,26 @@
+import argparse
 import os
 from dotenv import load_dotenv
-from NikGapps.helper.Args import Args
 from NikGapps.helper import Config
 from niklibrary.helper.SystemStat import SystemStat
 from niklibrary.git.GitlabManager import GitLabManager
 
 
 def copy_repos():
-    args = Args()
+    parser = argparse.ArgumentParser(description='Copy Repos Parser')
+    parser.add_argument('-S', '--source', default="", help='Source Repository')
+    parser.add_argument('-D', '--destination', default="", help='Destination Repository')
+    parser.add_argument('-A', '--android_version', default="", help='Android version')
+    args = parser.parse_args()
+    android_versions = str(args.android_version).replace("'", "").split(',')
+    if not android_versions or (len(android_versions) > 0 and android_versions[0] == ""):
+        android_versions = [Config.TARGET_ANDROID_VERSION]
     print("Start of the Program")
     SystemStat.show_stats()
     load_dotenv()
     Config.ENVIRONMENT_TYPE = os.getenv("ENVIRONMENT_TYPE") if os.getenv("ENVIRONMENT_TYPE") else "production"
     Config.RELEASE_TYPE = os.getenv("RELEASE_TYPE") if os.getenv("RELEASE_TYPE") else "stable"
-    android_versions = [Config.TARGET_ANDROID_VERSION]
-    if len(args.get_android_versions()) > 0:
-        android_versions = args.get_android_versions()
+
     # Config.UPLOAD_FILES = args.upload
     print("---------------------------------------")
     print("Android Versions to build: " + str(android_versions))
@@ -23,7 +28,8 @@ def copy_repos():
 
     for android_version in android_versions:
         gitlab_manager = GitLabManager(private_token=os.getenv("GITLAB_TOKEN"))
-        gitlab_manager.copy_repository(f"{android_version}_dev", f"{android_version}_beta", override_target=True)
+        gitlab_manager.copy_repository(f"{android_version}_{args.source}", f"{android_version}_{args.destination}",
+                                       override_target=True)
         # gitlab_manager.copy_repository(f"{android_version}_stable", f"{android_version}_ondemand", override_target=True)
         # gitlab_manager.copy_repository(f"{android_version}_stable_cached", f"{android_version}_ondemand_cached",
         #                                override_target=True)

{nikgapps-3.42 → nikgapps-3.44}/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.42 → nikgapps-3.44}/NikGapps/helper/assets/changelogs.yaml

@@ -1,9 +1,10 @@
-- date: 18th Oct 2024 (Android 10-15)
+- 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.44/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.42 → nikgapps-3.44}/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.42 → nikgapps-3.44/NikGapps.egg-info}/PKG-INFO

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

{nikgapps-3.42/NikGapps.egg-info → nikgapps-3.44}/PKG-INFO

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

{nikgapps-3.42 → nikgapps-3.44}/setup.py

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

nikgapps-3.42/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"
-}