From e302b37b6af77b0245235cc6a46218a7fb9b85d9 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefan.ceriu@gmail.com>
Date: Wed, 12 Aug 2026 15:01:26 +0300
Subject: [PATCH] Move Variants into the Components folder

Continue grouping the standalone modules under Components. Updates the
nightly.yml include path and the app icon banner path used by the
configure-nightly CI command.
---
 .../NightlyAppIcon.icon/Assets/Background.png       | Bin
 .../Resources/NightlyAppIcon.icon/Assets/Banner.svg |   0
 .../Resources/NightlyAppIcon.icon/Assets/Shapes.svg |   0
 .../NightlyAppIcon.icon/Assets/Surface.svg          |   0
 .../NightlyAppIcon.icon/Assets/Version.png          | Bin
 .../Nightly/Resources/NightlyAppIcon.icon/icon.json |   0
 .../Variants}/Nightly/nightly.yml                   |   0
 Tools/Sources/Commands/CI/ConfigureNightly.swift    |   6 +++---
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename {Variants => Components/Variants}/Nightly/Resources/NightlyAppIcon.icon/Assets/Background.png (100%)
 rename {Variants => Components/Variants}/Nightly/Resources/NightlyAppIcon.icon/Assets/Banner.svg (100%)
 rename {Variants => Components/Variants}/Nightly/Resources/NightlyAppIcon.icon/Assets/Shapes.svg (100%)
 rename {Variants => Components/Variants}/Nightly/Resources/NightlyAppIcon.icon/Assets/Surface.svg (100%)
 rename {Variants => Components/Variants}/Nightly/Resources/NightlyAppIcon.icon/Assets/Version.png (100%)
 rename {Variants => Components/Variants}/Nightly/Resources/NightlyAppIcon.icon/icon.json (100%)
 rename {Variants => Components/Variants}/Nightly/nightly.yml (100%)

diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Background.png b/Components/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Background.png
similarity index 100%
rename from Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Background.png
rename to Components/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Background.png
diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Banner.svg b/Components/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Banner.svg
similarity index 100%
rename from Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Banner.svg
rename to Components/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Banner.svg
diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Shapes.svg b/Components/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Shapes.svg
similarity index 100%
rename from Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Shapes.svg
rename to Components/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Shapes.svg
diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Surface.svg b/Components/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Surface.svg
similarity index 100%
rename from Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Surface.svg
rename to Components/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Surface.svg
diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Version.png b/Components/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Version.png
similarity index 100%
rename from Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Version.png
rename to Components/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Version.png
diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/icon.json b/Components/Variants/Nightly/Resources/NightlyAppIcon.icon/icon.json
similarity index 100%
rename from Variants/Nightly/Resources/NightlyAppIcon.icon/icon.json
rename to Components/Variants/Nightly/Resources/NightlyAppIcon.icon/icon.json
diff --git a/Variants/Nightly/nightly.yml b/Components/Variants/Nightly/nightly.yml
similarity index 100%
rename from Variants/Nightly/nightly.yml
rename to Components/Variants/Nightly/nightly.yml
diff --git a/Tools/Sources/Commands/CI/ConfigureNightly.swift b/Tools/Sources/Commands/CI/ConfigureNightly.swift
index 5fcf936c4..42f7d658c 100644
--- a/Tools/Sources/Commands/CI/ConfigureNightly.swift
+++ b/Tools/Sources/Commands/CI/ConfigureNightly.swift
@@ -31,8 +31,8 @@ struct ConfigureNightly: AsyncParsableCommand {
         }
         
         // Check if the nightly variant is already included
-        if projectConfig["include"]?.sequence?.contains(where: { $0.mapping?["path"] == "Variants/Nightly/nightly.yml" }) == false {
-            projectConfig["include"]?.sequence?.append(["path": "Variants/Nightly/nightly.yml"])
+        if projectConfig["include"]?.sequence?.contains(where: { $0.mapping?["path"] == "Components/Variants/Nightly/nightly.yml" }) == false {
+            projectConfig["include"]?.sequence?.append(["path": "Components/Variants/Nightly/nightly.yml"])
         }
         
         let updatedYAMLString = try Yams.serialize(node: projectConfig)
@@ -41,7 +41,7 @@ struct ConfigureNightly: AsyncParsableCommand {
     
     /// Generates the app icon banner with version and build number.
     private func generateAppIconBanner(buildNumber: String) async throws {
-        let iconPath = "Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Version.png"
+        let iconPath = "Components/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Version.png"
         try await AppIconBanner.parse([iconPath, "--build-number", buildNumber]).run()
     }
 }