Merge pull request #271 from CocoaPods/mr-xcode-7.0

[WIP] Get ready for Xcode 7.0
CocoaPods · Jun 25, 2015 · 8cf8e0f · 8cf8e0f
2 parents 43dae10 + e8cb468
commit 8cf8e0f
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,11 @@
   [Boris Bügling](https://github.com/neonichu)
   [Xcodeproj#272](https://github.com/CocoaPods/Xcodeproj/pull/272)
 
+* Update default build and scheme settings for Xcode 7.0.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [Boris Bügling](https://github.com/neonichu)
+  [Xcodeproj#271](https://github.com/CocoaPods/Xcodeproj/pull/271)
+
 ##### Bug Fixes
 
 * Fix the help output for `xcodeproj config-dump`.  

diff --git a/lib/xcodeproj/constants.rb b/lib/xcodeproj/constants.rb
@@ -28,6 +28,10 @@ module Constants
     #
     LAST_UPGRADE_CHECK  = '0700'
 
+    # @return [String] The last known object version to Xcodeproj.
+    #
+    LAST_SWIFT_UPGRADE_CHECK = '0700'
+
     # @return [Hash] The all the known ISAs grouped by superclass.
     #
     KNOWN_ISAS = {
@@ -153,6 +157,16 @@ module Constants
       }.freeze,
       [:debug, :application, :swift] => {
         'SWIFT_OPTIMIZATION_LEVEL'          => '-Onone',
+        'ENABLE_TESTABILITY'                => 'YES',
+      }.freeze,
+      [:debug, :dynamic_library, :swift] => {
+        'ENABLE_TESTABILITY'                => 'YES',
+      }.freeze,
+      [:debug, :framework, :swift] => {
+        'ENABLE_TESTABILITY'                => 'YES',
+      }.freeze,
+      [:debug, :static_library, :swift] => {
+        'ENABLE_TESTABILITY'                => 'YES',
       }.freeze,
       [:framework] => {
         'VERSION_INFO_PREFIX'               => '',

diff --git a/lib/xcodeproj/project/object/root_object.rb b/lib/xcodeproj/project/object/root_object.rb
@@ -20,7 +20,9 @@ class PBXProject < AbstractObject
         #         - `LastUpgradeCheck`
         #         - `ORGANIZATIONNAME`
         #
-        attribute :attributes, Hash, 'LastUpgradeCheck' => Constants::LAST_UPGRADE_CHECK
+        attribute :attributes, Hash,
+                  'LastSwiftUpdateCheck' => Constants::LAST_SWIFT_UPGRADE_CHECK,
+                  'LastUpgradeCheck' => Constants::LAST_UPGRADE_CHECK
 
         # @return [XCConfigurationList] the configuration list of the project.
         #

diff --git a/lib/xcodeproj/scheme.rb b/lib/xcodeproj/scheme.rb
@@ -33,6 +33,8 @@ def initialize
       @test_action.attributes['shouldUseLaunchSchemeArgsEnv'] = 'YES'
       @test_action.attributes['buildConfiguration'] = 'Debug'
 
+      @test_action_additional_options = @test_action.add_element 'AdditionalOptions'
+
       @testables = @test_action.add_element 'Testables'
 
       @launch_action = @scheme.add_element 'LaunchAction'
@@ -43,6 +45,7 @@ def initialize
       @launch_action.attributes['buildConfiguration'] = 'Debug'
       @launch_action.attributes['ignoresPersistentStateOnLaunch'] = 'NO'
       @launch_action.attributes['debugDocumentVersioning'] = 'YES'
+      @launch_action.attributes['debugServiceExtension'] = 'internal'
       @launch_action.attributes['allowLocationSimulation'] = 'YES'
       @launch_action.add_element('AdditionalOptions')
 
@@ -117,6 +120,7 @@ def add_test_target(test_target)
     #
     def set_launch_target(build_target)
       launch_product_runnable = @launch_action.add_element 'BuildableProductRunnable'
+      launch_product_runnable.attributes['runnableDebuggingMode'] = '0'
 
       launch_buildable_reference = launch_product_runnable.add_element 'BuildableReference'
       launch_buildable_reference.attributes['BuildableIdentifier'] = 'primary'

diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_OSX_Native/Swift_OSX_Native_debug.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_OSX_Native/Swift_OSX_Native_debug.xcconfig
@@ -1,5 +1,6 @@
 #include "Swift_OSX_Native/Swift_OSX_Native_base.xcconfig"
 COPY_PHASE_STRIP = NO
 GCC_PREPROCESSOR_DEFINITIONS = ["DEBUG=1", "$(inherited)"]
+ENABLE_TESTABILITY = YES
 MTL_ENABLE_DEBUG_INFO = YES
 SWIFT_OPTIMIZATION_LEVEL = -Onone
diff --git a/spec/fixtures/CommonBuildSettings/configs/Swift_iOS_Native/Swift_iOS_Native_debug.xcconfig b/spec/fixtures/CommonBuildSettings/configs/Swift_iOS_Native/Swift_iOS_Native_debug.xcconfig
@@ -1,5 +1,6 @@
 #include "Swift_iOS_Native/Swift_iOS_Native_base.xcconfig"
 COPY_PHASE_STRIP = NO
+ENABLE_TESTABILITY = YES
 GCC_PREPROCESSOR_DEFINITIONS = ["DEBUG=1", "$(inherited)"]
 MTL_ENABLE_DEBUG_INFO = YES
 SWIFT_OPTIMIZATION_LEVEL = -Onone
diff --git a/... Application.xcodeproj/xcshareddata/xcschemes/iOS application and static library.xcscheme b/... Application.xcodeproj/xcshareddata/xcschemes/iOS application and static library.xcscheme
@@ -86,6 +86,8 @@
             ReferencedContainer = "container:Cocoa Application.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -95,6 +97,7 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable>
          <BuildableReference

diff --git a/...ample Project/Cocoa Application.xcodeproj/xcshareddata/xcschemes/iOS application.xcscheme b/...ample Project/Cocoa Application.xcodeproj/xcshareddata/xcschemes/iOS application.xcscheme
@@ -48,6 +48,8 @@
             ReferencedContainer = "container:Cocoa Application.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -57,8 +59,10 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "E52523F316245AB20012E2BA"

diff --git a/...odeproj/xcshareddata/xcschemes/iOS applicationTests Set Build Target For Running.xcscheme b/...odeproj/xcshareddata/xcschemes/iOS applicationTests Set Build Target For Running.xcscheme
@@ -39,6 +39,8 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -48,6 +50,7 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <AdditionalOptions>
       </AdditionalOptions>

diff --git a/... Project/Cocoa Application.xcodeproj/xcshareddata/xcschemes/iOS applicationTests.xcscheme b/... Project/Cocoa Application.xcodeproj/xcshareddata/xcschemes/iOS applicationTests.xcscheme
@@ -23,6 +23,8 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -32,6 +34,7 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <AdditionalOptions>
       </AdditionalOptions>