Fix param ordering to be alphabetical

Signed-off-by: sebastian.shanus <sebastian.shanus@robinhood.com>

Author: sebastianv1

tools/generators/pbxproj_prefix/src/Generator/Environment.swift

@@ -31,16 +31,16 @@ extension Generator {
 
         let pbxProjectBuildSettings: (
             _ config: String,
+            _ createBuildSettingsAttribute: CreateBuildSettingsAttribute,
             _ importIndexBuildIndexstores: Bool,
-            _ legacyIndexImport: String,
             _ indexImport: String,
             _ indexingProjectDir: String,
-            _ separateIndexBuildOutputBase: Bool,
-            _ suppressCoverageBuild: Bool,
+            _ legacyIndexImport: String,
             _ projectDir: String,
             _ resolvedRepositories: String,
+            _ separateIndexBuildOutputBase: Bool,
+            _ suppressCoverageBuild: Bool,
             _ workspace: String,
-            _ createBuildSettingsAttribute: CreateBuildSettingsAttribute
         ) -> String
 
         let pbxProjectPrefixPartial: (

tools/generators/pbxproj_prefix/src/Generator/Generator.swift

@@ -49,23 +49,23 @@ struct Generator {
         let pbxProjectPrefixPartial = environment.pbxProjectPrefixPartial(
             /*buildSettings:*/ environment.pbxProjectBuildSettings(
                 /*config:*/ arguments.config,
+                /*createBuildSettingsAttribute:*/
+                        environment.createBuildSettingsAttribute,
                 /*importIndexBuildIndexstores:*/ arguments
                     .importIndexBuildIndexstores,
-                /*legacyIndexImport:*/ arguments.legacyIndexImport,
                 /*indexImport:*/ arguments.indexImport,
                 /*indexingProjectDir:*/ environment.indexingProjectDir(
                     /*projectDir:*/ projectDir
                 ),
-                /*separateIndexBuildOutputBase:*/ arguments.separateIndexBuildOutputBase,
-                /*suppressCoverageBuild:*/ arguments.suppressCoverageBuild,
+                /*legacyIndexImport:*/ arguments.legacyIndexImport,
                 /*projectDir:*/ projectDir,
                 /*resolvedRepositories:*/
                     try environment.readResolvedRepositoriesFile(
                         arguments.resolvedRepositoriesFile
                     ),
-                    /*workspace:*/ arguments.workspace,
-                    /*createBuildSettingsAttribute:*/
-                        environment.createBuildSettingsAttribute
+                /*separateIndexBuildOutputBase:*/ arguments.separateIndexBuildOutputBase,
+                /*suppressCoverageBuild:*/ arguments.suppressCoverageBuild,
+                /*workspace:*/ arguments.workspace
             ),
             /*compatibilityVersion:*/ environment.compatibilityVersion(
                 arguments.minimumXcodeVersion

tools/generators/pbxproj_prefix/src/Generator/PBXProjectBuildSettings.swift

@@ -21,16 +21,16 @@ extension Generator {
     ///   - workspace: The absolute path to the Bazel workspace.
     static func pbxProjectBuildSettings(
         config: String,
+        createBuildSettingsAttribute: CreateBuildSettingsAttribute,
         importIndexBuildIndexstores: Bool,
-        legacyIndexImport: String,
         indexImport: String,
         indexingProjectDir: String,
-        separateIndexBuildOutputBase: Bool,
-        suppressCoverageBuild: Bool,
+        legacyIndexImport: String,
         projectDir: String,
         resolvedRepositories: String,
-        workspace: String,
-        createBuildSettingsAttribute: CreateBuildSettingsAttribute
+        separateIndexBuildOutputBase: Bool,
+        suppressCoverageBuild: Bool,
+        workspace: String
     ) -> String {
         var buildSettings: [BuildSetting] = [
             .init(key: "ALWAYS_SEARCH_USER_PATHS", value: "NO"),

tools/generators/pbxproj_prefix/test/PBXProjectBuildSettingsTests.swift

@@ -87,16 +87,16 @@ class PBXProjectBuildSettingsTests: XCTestCase {
 
         let buildSettings = Generator.pbxProjectBuildSettings(
             config: config,
+            createBuildSettingsAttribute: CreateBuildSettingsAttribute(),
             importIndexBuildIndexstores: importIndexBuildIndexstores,
-            legacyIndexImport: legacyIndexImport,
             indexImport: indexImport,
             indexingProjectDir: indexingProjectDir,
-            separateIndexBuildOutputBase: false,
-            suppressCoverageBuild: false,
+            legacyIndexImport: legacyIndexImport,
             projectDir: projectDir,
             resolvedRepositories: resolvedRepositories,
-            workspace: workspace,
-            createBuildSettingsAttribute: CreateBuildSettingsAttribute()
+            separateIndexBuildOutputBase: false,
+            suppressCoverageBuild: false,
+            workspace: workspace
         )
 
         // Assert
@@ -119,12 +119,12 @@ class PBXProjectBuildSettingsTests: XCTestCase {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS = NO;
 				BAZEL_CONFIG = rxcp_custom_config;
-				BAZEL_SUPPRESS_COVERAGE_BUILD = YES;
 				BAZEL_EXTERNAL = "$(BAZEL_OUTPUT_BASE)/external";
 				BAZEL_INTEGRATION_DIR = "$(INTERNAL_DIR)/bazel";
 				BAZEL_LLDB_INIT = "$(HOME)/.lldbinit-rules_xcodeproj";
 				BAZEL_OUT = "$(PROJECT_DIR)/bazel-out";
 				BAZEL_OUTPUT_BASE = "$(_BAZEL_OUTPUT_BASE:standardizepath)";
+				BAZEL_SUPPRESS_COVERAGE_BUILD = YES;
 				BAZEL_WORKSPACE_ROOT = "$(SRCROOT)";
 				BUILD_DIR = "$(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
 				BUILD_MARKER_FILE = "$(OBJROOT)/build_marker";
@@ -145,6 +145,9 @@ class PBXProjectBuildSettingsTests: XCTestCase {
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				IMPORT_INDEX_BUILD_INDEXSTORES = NO;
+				INDEXING_PROJECT_DIR__ = "$(INDEXING_PROJECT_DIR__NO)";
+				INDEXING_PROJECT_DIR__NO = "/some/project dir";
+				INDEXING_PROJECT_DIR__YES = "/some/indexing/project dir";
 				INDEX_DATA_STORE_DIR = "$(INDEX_DATA_STORE_DIR)";
 				INDEX_FORCE_SCRIPT_EXECUTION = YES;
 				INDEX_IMPORT = "$(BAZEL_EXTERNAL)/index-import";
@@ -178,16 +181,16 @@ class PBXProjectBuildSettingsTests: XCTestCase {
 
         let buildSettings = Generator.pbxProjectBuildSettings(
             config: config,
+            createBuildSettingsAttribute: CreateBuildSettingsAttribute(),
             importIndexBuildIndexstores: importIndexBuildIndexstores,
-            legacyIndexImport: legacyIndexImport,
             indexImport: indexImport,
             indexingProjectDir: indexingProjectDir,
-            separateIndexBuildOutputBase: false,
-            suppressCoverageBuild: true,
+            legacyIndexImport: legacyIndexImport,
             projectDir: projectDir,
             resolvedRepositories: resolvedRepositories,
-            workspace: workspace,
-            createBuildSettingsAttribute: CreateBuildSettingsAttribute()
+            separateIndexBuildOutputBase: false,
+            suppressCoverageBuild: true,
+            workspace: workspace
         )
         XCTAssertNoDifference(buildSettings, expectedBuildSettings)
     }
@@ -274,16 +277,16 @@ class PBXProjectBuildSettingsTests: XCTestCase {
 
         let buildSettings = Generator.pbxProjectBuildSettings(
             config: config,
-            suppressCoverageBuild: false,
+            createBuildSettingsAttribute: CreateBuildSettingsAttribute(),
             importIndexBuildIndexstores: importIndexBuildIndexstores,
-            legacyIndexImport: legacyIndexImport,
             indexImport: indexImport,
             indexingProjectDir: indexingProjectDir,
-            separateIndexBuildOutputBase: true,
+            legacyIndexImport: legacyIndexImport,
             projectDir: projectDir,
             resolvedRepositories: resolvedRepositories,
-            workspace: workspace,
-            createBuildSettingsAttribute: CreateBuildSettingsAttribute()
+            separateIndexBuildOutputBase: true,
+            suppressCoverageBuild: false,
+            workspace: workspace
         )
 
         // Assert