Regenerate test project and add missing dependencies

2 files changed, 27 insertions, 14 deletions

diff --git a/swift/Rakefile b/swift/Rakefile
index f7bcfc6bd1d..a9efa81898a 100644
--- a/swift/Rakefile
+++ b/swift/Rakefile
@@ -272,12 +272,14 @@ def create_platform_targets(project, platform)
         target_add_files(target, group, "../slice/#{framework}", ["*.ice"])
         target_add_slice2swift_build_rule(project, target, framework)
         target.frameworks_build_phases.add_file_reference(ice_target.product_reference)
+        target.add_dependency(ice_target)
     end
 
     #
     # IceGrid requires Glacier2
     #
     icegrid_target.frameworks_build_phases.add_file_reference(glacier2_target.product_reference)
+    icegrid_target.add_dependency(glacier2_target)
 
     #
     # TestCommon framework
diff --git a/swift/ice.xcodeproj/xcshareddata/xcschemes/Ice macOS.xcscheme b/swift/ice.xcodeproj/xcshareddata/xcschemes/Ice macOS.xcscheme
index eb2a7cd6f10..102607b0233 100644
--- a/swift/ice.xcodeproj/xcshareddata/xcschemes/Ice macOS.xcscheme
+++ b/swift/ice.xcodeproj/xcshareddata/xcschemes/Ice macOS.xcscheme
@@ -7,11 +7,11 @@
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "7C84DBD38E4C23C31AD1F23C"
@@ -21,11 +21,11 @@
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "7DB95DDC2A0D311A6441555E"
@@ -35,11 +35,11 @@
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "901E6B19A44D60C62D27A9F6"
@@ -49,11 +49,11 @@
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "9E009F0CE808A84D564F958C"
@@ -65,14 +65,17 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -80,17 +83,25 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7C84DBD38E4C23C31AD1F23C"
+            BuildableName = "Ice.framework"
+            BlueprintName = "Ice macOS"
+            ReferencedContainer = "container:ice.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">