Merge pull request #247 from LinusU/xcode-0930

Target Xcode 9.3
tuist · Apr 10, 2018 · 0cdddc0 · 0cdddc0
2 parents 0d33e05 + 5871a31
commit 0cdddc0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/...space/WithoutWorkspace.xcodeproj/xcshareddata/xcschemes/WithoutWorkspace-Package.xcscheme b/...space/WithoutWorkspace.xcodeproj/xcshareddata/xcschemes/WithoutWorkspace-Package.xcscheme
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -47,7 +46,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Fixtures/iOS/Project.xcodeproj/xcshareddata/xcschemes/iOS.xcscheme b/Fixtures/iOS/Project.xcodeproj/xcshareddata/xcschemes/iOS.xcscheme
@@ -44,7 +44,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <PreActions>
          <ExecutionAction
@@ -119,7 +118,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Sources/xcproj/AEXML+XcodeFormat.swift b/Sources/xcproj/AEXML+XcodeFormat.swift
@@ -32,8 +32,8 @@ let attributesOrder: [String: [String]] = [
         "selectedLauncherIdentifier",
         "language",
         "region",
-        "shouldUseLaunchSchemeArgsEnv",
-        "codeCoverageEnabled"
+        "codeCoverageEnabled",
+        "shouldUseLaunchSchemeArgsEnv"
     ],
     "LaunchAction": [
         "buildConfiguration",

diff --git a/Sources/xcproj/XCScheme.swift b/Sources/xcproj/XCScheme.swift
@@ -490,7 +490,6 @@ final public class XCScheme {
                                        attributes: ["buildConfiguration": buildConfiguration,
                                                     "selectedDebuggerIdentifier": selectedDebuggerIdentifier,
                                                     "selectedLauncherIdentifier": selectedLauncherIdentifier,
-                                                    "language": language ?? "",
                                                     "launchStyle": launchStyle.rawValue,
                                                     "useCustomWorkingDirectory": useCustomWorkingDirectory.xmlString,
                                                     "ignoresPersistentStateOnLaunch": ignoresPersistentStateOnLaunch.xmlString,
@@ -519,6 +518,10 @@ final public class XCScheme {
                 element.addChild(EnvironmentVariable.xmlElement(from: environmentVariables))
             }
 
+            if let language = language {
+                element.attributes["language"] = language
+            }
+
             if let region = region {
                 element.attributes["region"] = region
             }
@@ -722,7 +725,9 @@ final public class XCScheme {
             attributes["buildConfiguration"] = buildConfiguration
             attributes["selectedDebuggerIdentifier"] = selectedDebuggerIdentifier
             attributes["selectedLauncherIdentifier"] = selectedLauncherIdentifier
-            attributes["language"] = language ?? ""
+            if let language = language {
+              attributes["language"] = language
+            }
             attributes["region"] = region
             attributes["shouldUseLaunchSchemeArgsEnv"] = shouldUseLaunchSchemeArgsEnv.xmlString
             if codeCoverageEnabled {