Merge pull request #69 from kylef-archive/kylef/frameworks

Support integrated KFData as a framework via CocoaPods

Author: kylef

.gitattributes

@@ -1,7 +1,6 @@
 language: objective-c
 before_install:
     - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
-    - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
     - cd Tests && pod install && cd $TRAVIS_BUILD_DIR
 script: make test
 

.travis.yml

@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
     corespec.ios.source_files = 'KFData/KFData.h', 'KFData/Core/*.{h,m}'
 
     corespec.osx.frameworks = 'CoreData'
-    corespec.osx.source_files = 'KFData/Core/*.{h,m}'
+    corespec.osx.source_files = 'KFData/KFData.h', 'KFData/Core/*.{h,m}'
   end
 
   s.subspec 'Store' do |storespec|
@@ -51,7 +51,7 @@ Pod::Spec.new do |s|
   s.subspec 'UI' do |uispec|
     uispec.dependency 'KFData/Manager'
     uispec.platform = :ios
-    uispec.ios.frameworks = 'UIKit'
+    uispec.ios.frameworks = 'UIKit', 'CoreData'
     uispec.ios.source_files = 'KFData/UI/*.{h,m}'
   end
 

KFData.podspec

@@ -16,8 +16,8 @@
 
  This notification will be fired on the main thread.
  */
-NSString * const KFDataManagedObjectContextWillReset;
-NSString * const KFDataManagedObjectContextDidReset;
+extern NSString * const KFDataManagedObjectContextWillReset;
+extern NSString * const KFDataManagedObjectContextDidReset;
 
 
 typedef NS_ENUM(NSUInteger, KFDataStoreConfigurationType) {

KFData.xcworkspace/xcshareddata/KFData.xccheckout

@@ -29,15 +29,15 @@ clean:
 
 test-osx:
 	@printf "\e[34m=> Running OS X Tests\033[0m\n"
-	@$(XCODEBUILD) -scheme 'OS X Tests' test | xcpretty -c | sed "s/^/ /" ; exit ${PIPESTATUS[0]}
+	@$(XCODEBUILD) -scheme 'OS X Tests' test
 
 test-ios:
 	@printf "\e[34m=> Running iOS Tests\033[0m\n"
-	@$(XCODEBUILD) -scheme 'iOS Tests' -sdk iphonesimulator -destination 'name=iPhone Retina (4-inch)' test 2>/dev/null | xcpretty -c | sed "s/^/ /" ; exit ${PIPESTATUS[0]}
+	@$(XCODEBUILD) -scheme 'iOS Tests' -sdk iphonesimulator -destination 'name=iPhone Retina (4-inch)' test
 
 test-podspec:
 	@printf "\e[34m=> Linting podspec\033[0m\n"
-	@pod lib lint KFData.podspec | sed "s/^/ /" ; exit ${PIPESTATUS[0]}
+	@pod lib lint KFData.podspec
 
 test: test-osx test-ios test-podspec
 

KFData/Store/KFDataStore.h

@@ -28,8 +28,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "63E5637DA82B4F9E894AC822"
-               BuildableName = "libPods-osx.a"
+               BlueprintIdentifier = "1A1946A05BE79DB5FB9A4891"
+               BuildableName = "Pods_osx.framework"
                BlueprintName = "Pods-osx"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
             </BuildableReference>
@@ -63,6 +63,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "778FBFA0176107B600DE0FFF"
+            BuildableName = "OS X Tests.xctest"
+            BlueprintName = "OS X Tests"
+            ReferencedContainer = "container:KFDataTests.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

Makefile

@@ -28,8 +28,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "50F70C15A59F4B898CEBD4D4"
-               BuildableName = "libPods-ios.a"
+               BlueprintIdentifier = "E46A35F6DD99B52C2939E879"
+               BuildableName = "Pods_ios.framework"
                BlueprintName = "Pods-ios"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
             </BuildableReference>
@@ -63,6 +63,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "778FBF751761077800DE0FFF"
+            BuildableName = "iOS Tests.xctest"
+            BlueprintName = "iOS Tests"
+            ReferencedContainer = "container:KFDataTests.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

Tests/KFDataTests.xcodeproj/project.pbxproj

@@ -1,23 +1,19 @@
-xcodeproj 'KFDataTests'
+project 'KFDataTests'
 workspace '../KFData'
 inhibit_all_warnings!
+use_frameworks!
 
-def import_pods
-    pod 'QueryKit'
-    pod 'KFData', :path => '../'
-    pod 'KFData/Compatibility', :path => '../'
-    pod 'Expecta'
-end
+abstract_target 'KFData' do
+  pod 'QueryKit'
+  pod 'KFData', :path => '../'
+  pod 'KFData/Compatibility', :path => '../'
+  pod 'Expecta'
 
-target :ios do
-    platform :ios, '5.0'
-    link_with 'iOS Tests'
-    import_pods
-end
+  target 'iOS Tests' do
+    platform :ios, '8.0'
+  end
 
-target :osx do
+  target 'OS X Tests' do
     platform :osx, '10.7'
-    link_with 'OS X Tests'
-    import_pods
+  end
 end
-