Support new platforms and modernization

Cedar-Info.plist

@@ -3,13 +3,15 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>io.pivotal.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
@@ -18,5 +20,7 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
 </dict>
 </plist>

Cedar.podspec

@@ -10,10 +10,17 @@ Pod::Spec.new do |s|
 
   s.osx.deployment_target = '10.7'
   s.ios.deployment_target = '6.0'
+  s.watchos.deployment_target = '2.0'
   s.source_files = 'Source/**/*.{h,m,mm}'
   s.public_header_files = 'Source/Headers/Public/**/*.{h}'
-  s.osx.exclude_files = '**/iPhone/**'
+  s.osx.exclude_files = '**/{iOS,UIKit}/**'
   s.ios.exclude_files = '**/OSX/**'
+  s.watchos.exclude_files = '**/{OSX,iOS}/**'
+
+  if s.respond_to?(:tvos)
+    s.tvos.deployment_target = '9.0'
+    s.tvos.exclude_files = '**/OSX/**'
+  end
 
   # Versions of this pod >= 0.9.0 require C++11.
   #   https://github.com/pivotal/cedar/issues/47

Cedar.xcodeproj/xcshareddata/xcschemes/Cedar OS X Host App.xcscheme → Cedar.xcodeproj/xcshareddata/xcschemes/Cedar-OSX SpecBundle.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
-   version = "1.3">
+   LastUpgradeVersion = "0710"
+   version = "1.8">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -15,22 +15,22 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "AE248F9719DCD52500092C14"
-               BuildableName = "Cedar OS X Host App.app"
-               BlueprintName = "Cedar OS X Host App"
+               BuildableName = "Cedar-OSX HostApp.app"
+               BlueprintName = "Cedar-OSX HostApp"
                ReferencedContainer = "container:Cedar.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
+            buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "AE248FA919DCD52500092C14"
-               BuildableName = "Cedar OS X Host AppTests.xctest"
-               BlueprintName = "Cedar OS X Host AppTests"
+               BuildableName = "Cedar-OSX SpecBundle.xctest"
+               BlueprintName = "Cedar-OSX SpecBundle"
                ReferencedContainer = "container:Cedar.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -47,8 +47,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "AE248FA919DCD52500092C14"
-               BuildableName = "Cedar OS X Host AppTests.xctest"
-               BlueprintName = "Cedar OS X Host AppTests"
+               BuildableName = "Cedar-OSX SpecBundle.xctest"
+               BlueprintName = "Cedar-OSX SpecBundle"
                ReferencedContainer = "container:Cedar.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -57,8 +57,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "AE248F9719DCD52500092C14"
-            BuildableName = "Cedar OS X Host App.app"
-            BlueprintName = "Cedar OS X Host App"
+            BuildableName = "Cedar-OSX HostApp.app"
+            BlueprintName = "Cedar-OSX HostApp"
             ReferencedContainer = "container:Cedar.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -80,8 +80,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "AE248F9719DCD52500092C14"
-            BuildableName = "Cedar OS X Host App.app"
-            BlueprintName = "Cedar OS X Host App"
+            BuildableName = "Cedar-OSX HostApp.app"
+            BlueprintName = "Cedar-OSX HostApp"
             ReferencedContainer = "container:Cedar.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
@@ -99,8 +99,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "AE248F9719DCD52500092C14"
-            BuildableName = "Cedar OS X Host App.app"
-            BlueprintName = "Cedar OS X Host App"
+            BuildableName = "Cedar-OSX HostApp.app"
+            BlueprintName = "Cedar-OSX HostApp"
             ReferencedContainer = "container:Cedar.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>

Cedar.xcodeproj/xcshareddata/xcschemes/Cedar-OSX Specs.xcscheme

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0710"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AEEE218511DC28E200029872"
+               BuildableName = "Cedar-OSX Specs"
+               BlueprintName = "Cedar-OSX Specs"
+               ReferencedContainer = "container:Cedar.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "AEEE218511DC28E200029872"
+            BuildableName = "Cedar-OSX Specs"
+            BlueprintName = "Cedar-OSX Specs"
+            ReferencedContainer = "container:Cedar.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "AEEE218511DC28E200029872"
+            BuildableName = "Cedar-OSX Specs"
+            BlueprintName = "Cedar-OSX Specs"
+            ReferencedContainer = "container:Cedar.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OBJC_DISABLE_GC"
+            value = "YES"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "AEEE218511DC28E200029872"
+            BuildableName = "Cedar-OSX Specs"
+            BlueprintName = "Cedar-OSX Specs"
+            ReferencedContainer = "container:Cedar.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Cedar.xcodeproj/xcshareddata/xcschemes/Cedar OS X Specs.xcscheme → Cedar.xcodeproj/xcshareddata/xcschemes/Cedar-OSX.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
-   version = "1.3">
+   LastUpgradeVersion = "0710"
+   version = "1.8">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -14,23 +14,23 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AEEE218511DC28E200029872"
-               BuildableName = "Cedar OS X Specs"
-               BlueprintName = "Cedar OS X Specs"
+               BlueprintIdentifier = "AEEE1FB511DC271300029872"
+               BuildableName = "Cedar.framework"
+               BlueprintName = "Cedar-OSX"
                ReferencedContainer = "container:Cedar.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "96158A85144A915E005895CE"
-               BuildableName = "OCUnitAppLogicTests.octest"
-               BlueprintName = "OCUnitAppLogicTests"
+               BlueprintIdentifier = "AE248FA919DCD52500092C14"
+               BuildableName = "Cedar-OSX SpecBundle.xctest"
+               BlueprintName = "Cedar-OSX SpecBundle"
                ReferencedContainer = "container:Cedar.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -46,22 +46,24 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "96158A85144A915E005895CE"
-               BuildableName = "OCUnitAppLogicTests.octest"
-               BlueprintName = "OCUnitAppLogicTests"
+               BlueprintIdentifier = "AE248FA919DCD52500092C14"
+               BuildableName = "Cedar-OSX SpecBundle.xctest"
+               BlueprintName = "Cedar-OSX SpecBundle"
                ReferencedContainer = "container:Cedar.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "AEEE218511DC28E200029872"
-            BuildableName = "Cedar OS X Specs"
-            BlueprintName = "Cedar OS X Specs"
+            BlueprintIdentifier = "AEEE1FB511DC271300029872"
+            BuildableName = "Cedar.framework"
+            BlueprintName = "Cedar-OSX"
             ReferencedContainer = "container:Cedar.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -71,23 +73,17 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "AEEE218511DC28E200029872"
-            BuildableName = "Cedar OS X Specs"
-            BlueprintName = "Cedar OS X Specs"
+            BlueprintIdentifier = "AEEE1FB511DC271300029872"
+            BuildableName = "Cedar.framework"
+            BlueprintName = "Cedar-OSX"
             ReferencedContainer = "container:Cedar.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "OBJC_DISABLE_GC"
-            value = "YES"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -97,15 +93,15 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "AEEE218511DC28E200029872"
-            BuildableName = "Cedar OS X Specs"
-            BlueprintName = "Cedar OS X Specs"
+            BlueprintIdentifier = "AEEE1FB511DC271300029872"
+            BuildableName = "Cedar.framework"
+            BlueprintName = "Cedar-OSX"
             ReferencedContainer = "container:Cedar.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">