Switch from CocoaPods to Carthage for development

and add Carthage support

.gitignore

@@ -1,8 +1,6 @@
-Pods
-Example/WildeGuess/Pod
 *xcuserdata
-*.xcworkspace
 appledoc
 *.gcov
 .DS_Store
-ObjectiveC.gc*
+Carthage/Build
+ObjectiveC.gc*

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "Carthage/Checkouts/ocmock"]
+	path = Carthage/Checkouts/ocmock
+	url = https://github.com/erikdoe/ocmock.git
+[submodule "Carthage/Checkouts/xcconfigs"]
+	path = Carthage/Checkouts/xcconfigs
+	url = https://github.com/jspahrsummers/xcconfigs.git
+[submodule "Carthage/Checkouts/ios-snapshot-test-case"]
+	path = Carthage/Checkouts/ios-snapshot-test-case
+	url = https://github.com/facebook/ios-snapshot-test-case.git

.travis.yml

@@ -1,7 +1,9 @@
 language: objective-c
+osx_image: xcode7.3
 
 before_install:
-  - gem install cocoapods -v 0.37.2
+  - brew update
+  - brew outdated xctool || brew upgrade xctool
 
 script: ./build.sh ci
 

CONTRIBUTING.md

@@ -28,6 +28,24 @@ outlined on that page and do not file a public issue.
 ## Coding Style
 * 2 spaces for indentation rather than tabs
 
+## Updating Testing Dependencies
+
+If you need a different version of one of the testing dependencies, you will need to first install `carthage`:
+
+```
+brew install carthage
+```
+
+Then, edit `Cartfile.private` to specify the [version](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#user-content-version-requirement) of the dependency you'd like to use.
+
+Finally, run
+
+```
+carthage update --use-submodules --platform iOS
+```
+
+to update the dependency to that version.
+
 ## License
 By contributing to ComponentKit, you agree that your contributions will be
 licensed under its BSD license.

Cartfile.private

@@ -0,0 +1,4 @@
+github "erikdoe/ocmock" ~> 3.3
+github "facebook/ios-snapshot-test-case" ~> 2.1
+github "jspahrsummers/xcconfigs" ~> 0.9
+

Cartfile.resolved

@@ -0,0 +1,3 @@
+github "facebook/ios-snapshot-test-case" "2.1.0"
+github "erikdoe/ocmock" "v3.3"
+github "jspahrsummers/xcconfigs" "0.9"

ComponentKit.xcodeproj/xcshareddata/xcschemes/ComponentKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,68 +14,12 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B3EECEC11AC2366600BFC5DA"
-               BuildableName = "ComponentKit.app"
+               BlueprintIdentifier = "D0B47AB41CBD924100BB33CE"
+               BuildableName = "ComponentKit.framework"
                BlueprintName = "ComponentKit"
                ReferencedContainer = "container:ComponentKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A27380191AFD144100E6F222"
-               BuildableName = "libComponentKitTestHelpers.a"
-               BlueprintName = "ComponentKitTestHelpers"
-               ReferencedContainer = "container:ComponentKit.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B342DC3F1AC23E8200ACAC53"
-               BuildableName = "ComponentKitTests.xctest"
-               BlueprintName = "ComponentKitTests"
-               ReferencedContainer = "container:ComponentKit.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B342DCA91AC23F2A00ACAC53"
-               BuildableName = "ComponentTextKitApplicationTests.xctest"
-               BlueprintName = "ComponentTextKitApplicationTests"
-               ReferencedContainer = "container:ComponentKit.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B342DC8A1AC23EC300ACAC53"
-               BuildableName = "ComponentKitApplicationTests.xctest"
-               BlueprintName = "ComponentKitApplicationTests"
-               ReferencedContainer = "container:ComponentKit.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -88,38 +32,38 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B342DC3F1AC23E8200ACAC53"
-               BuildableName = "ComponentKitTests.xctest"
-               BlueprintName = "ComponentKitTests"
+               BlueprintIdentifier = "B342DC8A1AC23EC300ACAC53"
+               BuildableName = "ComponentKitApplicationTests.xctest"
+               BlueprintName = "ComponentKitApplicationTests"
                ReferencedContainer = "container:ComponentKit.xcodeproj">
             </BuildableReference>
          </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B342DCA91AC23F2A00ACAC53"
-               BuildableName = "ComponentTextKitApplicationTests.xctest"
-               BlueprintName = "ComponentTextKitApplicationTests"
+               BlueprintIdentifier = "B342DC3F1AC23E8200ACAC53"
+               BuildableName = "ComponentKitTests.xctest"
+               BlueprintName = "ComponentKitTests"
                ReferencedContainer = "container:ComponentKit.xcodeproj">
             </BuildableReference>
          </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B342DC8A1AC23EC300ACAC53"
-               BuildableName = "ComponentKitApplicationTests.xctest"
-               BlueprintName = "ComponentKitApplicationTests"
+               BlueprintIdentifier = "B342DCA91AC23F2A00ACAC53"
+               BuildableName = "ComponentTextKitApplicationTests.xctest"
+               BlueprintName = "ComponentTextKitApplicationTests"
                ReferencedContainer = "container:ComponentKit.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B3EECEC11AC2366600BFC5DA"
-            BuildableName = "ComponentKit.app"
+            BlueprintIdentifier = "D0B47AB41CBD924100BB33CE"
+            BuildableName = "ComponentKit.framework"
             BlueprintName = "ComponentKit"
             ReferencedContainer = "container:ComponentKit.xcodeproj">
          </BuildableReference>
@@ -137,16 +81,15 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B3EECEC11AC2366600BFC5DA"
-            BuildableName = "ComponentKit.app"
+            BlueprintIdentifier = "D0B47AB41CBD924100BB33CE"
+            BuildableName = "ComponentKit.framework"
             BlueprintName = "ComponentKit"
             ReferencedContainer = "container:ComponentKit.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -156,16 +99,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B3EECEC11AC2366600BFC5DA"
-            BuildableName = "ComponentKit.app"
+            BlueprintIdentifier = "D0B47AB41CBD924100BB33CE"
+            BuildableName = "ComponentKit.framework"
             BlueprintName = "ComponentKit"
             ReferencedContainer = "container:ComponentKit.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

ComponentKit/ComponentKit.xcconfig

@@ -0,0 +1,21 @@
+//
+//  Copyright (c) 2014-present, Facebook, Inc.
+//  All rights reserved.
+//
+//  This source code is licensed under the BSD-style license found in the
+//  LICENSE file in the root directory of this source tree. An additional grant
+//  of patent rights can be found in the PATENTS file in the same directory.
+//
+
+#include "../Carthage/Checkouts/xcconfigs/iOS/iOS-Framework.xcconfig"
+
+PRODUCT_NAME = ComponentKit
+INFOPLIST_FILE = ComponentKit/Info.plist
+PRODUCT_BUNDLE_IDENTIFIER = org.componentkit.ComponentKit
+ALWAYS_SEARCH_USER_PATHS = NO
+CLANG_ENABLE_OBJC_ARC = YES
+CLANG_ENABLE_MODULES = YES
+
+ONLY_ACTIVE_ARCH[config=Debug] = YES
+GCC_OPTIMIZATION_LEVEL[config=Debug] = 0
+COPY_PHASE_STRIP[config=Debug] = NO

ComponentKit/Debug/CKComponentDebugController.h

@@ -27,7 +27,7 @@
 /**
  Setting the debug mode enables the injection of debug configuration into the component.
  */
-+ (void)setDebugMode:(BOOL)debugMode;
++ (void)setDebugMode:(BOOL)debugMode NS_EXTENSION_UNAVAILABLE("Recursively reflows components using -[UIApplication keyWindow]");
 
 /**
  Components are an immutable construct. Whenever we make changes to the parameters on which the components depended,
@@ -36,7 +36,7 @@
 
  This is particularly used in reflowing the component hierarchy when we set the debug mode.
  */
-+ (void)reflowComponents;
++ (void)reflowComponents NS_EXTENSION_UNAVAILABLE("Recursively reflows components using -[UIApplication keyWindow]");
 
 @end
 

ComponentKit/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<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>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>