From fd57e046ea5c06537ed3111c2dd83c57434d4b96 Mon Sep 17 00:00:00 2001
From: Andrew Kitchen <akitchen@gmail.com>
Date: Fri, 12 Jun 2015 22:10:11 -0700
Subject: [PATCH 1/2] Xcode 7 metadata changes

---
 .../xcshareddata/xcschemes/Cedar OS X Host App.xcscheme  | 9 +++++++--
 .../xcschemes/Cedar iOS XCTest Tests.xcscheme            | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar OS X Host App.xcscheme b/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar OS X Host App.xcscheme
index 0d851452..db3c2f94 100644
--- a/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar OS X Host App.xcscheme	
+++ b/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar OS X Host App.xcscheme	
@@ -62,6 +62,8 @@
             ReferencedContainer = "container:Cedar.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -71,8 +73,10 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "AE248F9719DCD52500092C14"
@@ -90,7 +94,8 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "AE248F9719DCD52500092C14"
diff --git a/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar iOS XCTest Tests.xcscheme b/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar iOS XCTest Tests.xcscheme
index dba42ca2..57d85db1 100644
--- a/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar iOS XCTest Tests.xcscheme	
+++ b/Cedar.xcodeproj/xcshareddata/xcschemes/Cedar iOS XCTest Tests.xcscheme	
@@ -48,6 +48,8 @@
             ReferencedContainer = "container:Cedar.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 = "96B5F9F5144A81A7000A6A5D"
@@ -76,7 +80,8 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "96B5F9F5144A81A7000A6A5D"

From 20fd99b4e49cac321632bd0cdbb509dec2b80fa9 Mon Sep 17 00:00:00 2001
From: Andrew Kitchen <akitchen@gmail.com>
Date: Fri, 12 Jun 2015 22:11:06 -0700
Subject: [PATCH 2/2] Fixes compilation issues in latest toolchain

Conform to nonnull semantics in a couple places
---
 Spec/CDRSpecFailureSpec.mm                   | 4 ++--
 Spec/Doubles/CedarDoubleARCSharedExamples.mm | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Spec/CDRSpecFailureSpec.mm b/Spec/CDRSpecFailureSpec.mm
index 43a207ef..45967fda 100644
--- a/Spec/CDRSpecFailureSpec.mm
+++ b/Spec/CDRSpecFailureSpec.mm
@@ -93,7 +93,7 @@
             context(@"when file name and line number are specified in exception's userInfo", ^{
                 beforeEach(^{
                     NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:@"File.m", @"fileName", [NSNumber numberWithInt:123], @"lineNumber", nil];
-                    NSException *exception = [NSException exceptionWithName:nil reason:@"exception reason" userInfo:userInfo];
+                    NSException *exception = [NSException exceptionWithName:@"boo" reason:@"exception reason" userInfo:userInfo];
                     failure = [CDRSpecFailure specFailureWithRaisedObject:exception];
                 });
 
@@ -112,7 +112,7 @@
 
             context(@"when file name and line number are not specified in userInfo of exception", ^{
                 beforeEach(^{
-                    NSException *exception = [NSException exceptionWithName:nil reason:@"exception reason" userInfo:nil];
+                    NSException *exception = [NSException exceptionWithName:@"boo" reason:@"exception reason" userInfo:nil];
                     failure = [CDRSpecFailure specFailureWithRaisedObject:exception];
                 });
 
diff --git a/Spec/Doubles/CedarDoubleARCSharedExamples.mm b/Spec/Doubles/CedarDoubleARCSharedExamples.mm
index 473c1fc0..f2ad2439 100644
--- a/Spec/Doubles/CedarDoubleARCSharedExamples.mm
+++ b/Spec/Doubles/CedarDoubleARCSharedExamples.mm
@@ -43,7 +43,6 @@ myDouble stub_method("methodWithBlock:").and_do(^(NSInvocation *invocation) {
                 });
 
                 while (!called) {
-                    [[NSRunLoop currentRunLoop] addTimer:[NSTimer timerWithTimeInterval:0.1 invocation:nil repeats:NO] forMode:NSDefaultRunLoopMode];
                     NSDate *futureDate = [NSDate dateWithTimeIntervalSinceNow:0.1];
                     [[NSRunLoop currentRunLoop] runUntilDate:futureDate];
                 }