NikGapps 3.42__py3-none-any.whl → 3.44__py3-none-any.whl

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/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/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/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/helper/assets/config_versions.json

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

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.dist-info → NikGapps-3.44.dist-info}/METADATA

@@ -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.dist-info → NikGapps-3.44.dist-info}/RECORD

@@ -2,12 +2,12 @@ NikGapps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NikGapps/build_config.py,sha256=QVWmRLUIv1US8OWeBwwiAHLTBu6heMF1aFezsud8Fxw,3193
 NikGapps/cache.py,sha256=lQTX3-JZOCWhgsiaklKRLSy46FKX9WwQ49dyrLnSQTk,4057
 NikGapps/config_upload.py,sha256=0HE7txm73XXxat_cR0JDXWtQUmg1IYK_SktwJS6N34s,652
-NikGapps/copy_repos.py,sha256=I6cL-lhvhFtbX9pzepahmven7yB7_5-zd7aE7g57y34,1498
+NikGapps/copy_repos.py,sha256=AXI1LIO_4pXkJUTlIsW45JRpEIkmICPVcCDOJ-YIauk,1951
 NikGapps/main.py,sha256=Uv0HXy59-cuKM3Y33YGIA7URYIlP32SJ9Mq-P7uorNw,2590
 NikGapps/overlay_control.py,sha256=3BVA8v5JeaFPqKbnjbrDE9qyxY12YTYAoH15r1thE-w,3097
 NikGapps/test.py,sha256=M6fpDBtOpwHgR9bjAEhhjgGtAN9UuLEKZSU0HFX-xdE,84
 NikGapps/build/Build.py,sha256=_-gEQD2vkci-dQOmiE-SCULiAGQ-LkyKWXhvCP61884,7621
-NikGapps/build/NikGappsManager.py,sha256=o42UCfosxeWSMevBN4ckN062RJ083xxLEti6_Lcq3yg,21664
+NikGapps/build/NikGappsManager.py,sha256=Fph8nTN2A344NwkefwPZPBHJpsOERt32n7tlH4b556g,21684
 NikGapps/build/NikGappsOverlays.py,sha256=bbAIuIeE7HICdXRNeZJrvuW58_tUuDH9Du_1k6QPkxg,569
 NikGapps/build/PackageConstants.py,sha256=-vmkiAWXoD5Ba1lmqd71ueEkivY7ne0zXSU3dzCfYLc,15847
 NikGapps/build/Release.py,sha256=ww2ol4v6ZbL31EG8T3X0HzWtqWcZZKz3JYr93kVRZ5M,4834
@@ -22,9 +22,9 @@ NikGapps/helper/ConfigObj.py,sha256=ep9--o1SPgGXkElrjkf7hjF96KGSrmcQ9oGCpicN7D4,
 NikGapps/helper/Package.py,sha256=P8BU3r_5t_6-Qs0WoTAt0rB64oVzqAE-NERItwYW1X4,9182
 NikGapps/helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NikGapps/helper/assets/addon.sh,sha256=qXwZ7GQVnOrkSNRcJTKycKRKkUa8kRA_iDwsKVDMHwY,9424
-NikGapps/helper/assets/appsets.json,sha256=oIxqDUAZda7eOT9bloFRVpX2nHQ1klfF1YEPDOUFJh0,7070
-NikGapps/helper/assets/changelogs.yaml,sha256=v-hvZZ56Kk-fgLzKhwrb0yHDOIkDEQu48yE9Lypyonw,48132
-NikGapps/helper/assets/config_versions.json,sha256=T7fJFW5uYUbiZphw7VP89T4F1WKK6EzG7q_33M8zrJA,102
+NikGapps/helper/assets/appsets.json,sha256=quNDURzp2TlRzxPTuQKnKtSnbnkbBhQMElAFHKxuYCo,7090
+NikGapps/helper/assets/changelogs.yaml,sha256=ztHyBxWSs5DLpLax5fAvzrjztXFhzJiczybsYkBSUN0,48223
+NikGapps/helper/assets/config_versions.json,sha256=3BpuCgsUUrcHTeO-cFsZ-dS9EUcegNYI1vPK2v053-M,102
 NikGapps/helper/assets/customize.sh,sha256=bfYUgf1vd7GGUix4CPIhzn2eFN-DJh67IVIY6eMIrGo,10242
 NikGapps/helper/assets/debloater.config,sha256=7Wx-WH93JSJHTYJCT5-y8TtPFFIzQgMKJcKJaf583bU,878
 NikGapps/helper/assets/functions.sh,sha256=9jOHEM0cmkP0cMIj7KaNwXDOAG0WxOuIZganxu1YoFU,3859
@@ -37,7 +37,7 @@ NikGapps/helper/assets/mount.sh,sha256=G_rAktQyrUQJpQlCpihbCwWrDCJ71zNEZJ3ZCARA7
 NikGapps/helper/assets/mtg_mount.sh,sha256=M6oYs7aLmMRBJbIq8ANmHxGrTIf7Jxe0GLsPq3SdmJ0,2697
 NikGapps/helper/assets/nikgapps.config,sha256=807lgmt0MhX2hx18ZgM7idj5ZwCgyHkKJ4VtSKOD3ew,1575
 NikGapps/helper/assets/nikgapps_functions.sh,sha256=SXzJEPTwYdhqPqgSAUx9Fa4UNPWSbNHVuUI31TGFAh8,57645
-NikGapps/helper/assets/packages.json,sha256=HBvfNR8mXJyJ4hDI8EKbV5-eGyUlpO9LeWlujuPRjTs,17269
+NikGapps/helper/assets/packages.json,sha256=3urinTXrQRfomo0DTO4_CdQLAFWXwRKRFv6hxxsaBKM,18223
 NikGapps/helper/assets/uninstaller.sh,sha256=Lob89FNVfpHFkdzUJFDwVQwlnc7WB_U-U28Y4fZgycE,870
 NikGapps/helper/assets/unmount.sh,sha256=L8Lq7ZVfwazXaZp5Jkuce2pCGJCLZh57uj_BzFSDb-c,1107
 NikGapps/helper/compression/CompOps.py,sha256=RjYxtNh98xCds58oWxX8UGbe9g-WUYCriTRupWZqMZc,1823
@@ -54,9 +54,9 @@ NikGapps/helper/overlay/Resources.py,sha256=bKWJEF2avl3j2ud390HQq9fRMMA8GKh9-KAB
 NikGapps/helper/overlay/String.py,sha256=nyCAD_dNfwHlOgj4zuKGGz71n20CLEKyZCgrVAmiX2I,469
 NikGapps/helper/overlay/StringArray.py,sha256=DYPEAIdpicaJ3C08IYW6Q2tnTH6gUFXmu3KhQlHGY5g,563
 NikGapps/helper/overlay/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-NikGapps-3.42.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-NikGapps-3.42.dist-info/METADATA,sha256=RLMd6jvmDrsvxoHlP12KfgBODkW_Pz_ssr8cXHGU1_c,4147
-NikGapps-3.42.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-NikGapps-3.42.dist-info/entry_points.txt,sha256=iKbeOiuELwTDu5kmQHrU9XBVASWRR6_TuRIRva2UnAY,286
-NikGapps-3.42.dist-info/top_level.txt,sha256=CD7RpCb7bzjyvpQLt8hh2gU6X1wj3Z0NIErVkg-nJI4,9
-NikGapps-3.42.dist-info/RECORD,,
+NikGapps-3.44.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+NikGapps-3.44.dist-info/METADATA,sha256=tNHEim4mo6CYHcNcg66gd2zELeAn8L_e7ThseI01BR4,4147
+NikGapps-3.44.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+NikGapps-3.44.dist-info/entry_points.txt,sha256=iKbeOiuELwTDu5kmQHrU9XBVASWRR6_TuRIRva2UnAY,286
+NikGapps-3.44.dist-info/top_level.txt,sha256=CD7RpCb7bzjyvpQLt8hh2gU6X1wj3Z0NIErVkg-nJI4,9
+NikGapps-3.44.dist-info/RECORD,,