Merge pull request #109 from RCacheaux/MacroForLinkerCategoryBug

Eliminated requirement to use -all_load linker flag.
appsquickly · Nov 28, 2013 · 53d4311 · 53d4311
2 parents 68062e1 + 87f550f
commit 53d4311
Show file tree

Hide file tree

Showing 19 changed files with 13,235 additions and 3,510 deletions.
diff --git a/Source/Component/TyphoonDefinition+Infrastructure.m b/Source/Component/TyphoonDefinition+Infrastructure.m
@@ -10,6 +10,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
+#import "TyphoonLinkerCategoryBugFix.h"
+TYPHOON_FIX_CATEGORY_BUG(TyphoonDefinition_Infrastructure)
+
 #import "TyphoonDefinition+Infrastructure.h"
 #import "TyphoonPropertyPlaceholderConfigurer.h"
 #import "TyphoonResource.h"

diff --git a/Source/Factory/InstanceBuilder/TyphoonComponentFactory+InstanceBuilder.m b/Source/Factory/InstanceBuilder/TyphoonComponentFactory+InstanceBuilder.m
@@ -10,6 +10,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
+#import "TyphoonLinkerCategoryBugFix.h"
+TYPHOON_FIX_CATEGORY_BUG(TyphoonComponentFactory_InstanceBuilder)
+
 #import <objc/message.h>
 #import "TyphoonComponentFactory+InstanceBuilder.h"
 #import "TyphoonDefinition.h"

diff --git a/Source/Factory/InstanceBuilder/TyphoonDefinition+InstanceBuilder.m b/Source/Factory/InstanceBuilder/TyphoonDefinition+InstanceBuilder.m
@@ -9,6 +9,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+#import "TyphoonLinkerCategoryBugFix.h"
+TYPHOON_FIX_CATEGORY_BUG(TyphoonDefinition_InstanceBuilder)
+
 #import "TyphoonDefinition+InstanceBuilder.h"
 #import "TyphoonPropertyInjectedWithStringRepresentation.h"
 #import "TyphoonPropertyInjectedByType.h"

diff --git a/Source/Factory/InstanceBuilder/TyphoonInitializer+InstanceBuilder.m b/Source/Factory/InstanceBuilder/TyphoonInitializer+InstanceBuilder.m
@@ -11,6 +11,9 @@
 
 
 
+#import "TyphoonLinkerCategoryBugFix.h"
+TYPHOON_FIX_CATEGORY_BUG(TyphoonInitializer_InstanceBuilder)
+
 #import "TyphoonInitializer+InstanceBuilder.h"
 #import "TyphoonParameterInjectedWithStringRepresentation.h"
 #import "TyphoonDefinition.h"

diff --git a/Source/Factory/Xml/TyphoonRXMLElement+XmlComponentFactory.m b/Source/Factory/Xml/TyphoonRXMLElement+XmlComponentFactory.m
@@ -11,6 +11,9 @@
 
 
 
+#import "TyphoonLinkerCategoryBugFix.h"
+TYPHOON_FIX_CATEGORY_BUG(TyphoonRXMLElement_XmlComponentFactory)
+
 #import "TyphoonRXMLElement+XmlComponentFactory.h"
 #import "TyphoonInjectedProperty.h"
 #import "TyphoonPropertyInjectedByReference.h"

diff --git a/Source/Utils/NSObject+TyphoonIntrospectionUtils.m b/Source/Utils/NSObject+TyphoonIntrospectionUtils.m
@@ -12,6 +12,9 @@
 
 
 
+#import "TyphoonLinkerCategoryBugFix.h"
+TYPHOON_FIX_CATEGORY_BUG(NSObject_TyphoonIntrospectionUtils)
+
 #import <objc/runtime.h>
 #import "TyphoonTypeDescriptor.h"
 #import "TyphoonIntrospectionUtils.h"

diff --git a/Source/Utils/TyphoonLinkerCategoryBugFix.h b/Source/Utils/TyphoonLinkerCategoryBugFix.h
@@ -0,0 +1,25 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2013, Jasper Blues & Contributors
+//  All Rights Reserved.
+//
+//  NOTICE: The authors permit you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ Add this macro before each category implementation, so we don't have to use
+ -all_load or -force_load to load object files from static libraries that only contain
+ categories and no classes.
+ See http://developer.apple.com/library/mac/#qa/qa2006/qa1490.html for more info.
+ 
+ Shamelessly borrowed from Three20 and RestKit
+ */
+
+#define TYPHOON_FIX_CATEGORY_BUG(name) \
+@interface TYPHOON_FIX_CATEGORY_BUG_##name : NSObject \
+@end \
+@implementation TYPHOON_FIX_CATEGORY_BUG_##name \
+@end
diff --git a/Tests/Podfile.lock b/Tests/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - OCHamcrest (1.9)
   - OCMockito (0.23):
     - OCHamcrest
-  - Typhoon (1.5.4)
+  - Typhoon (1.5.7)
 
 DEPENDENCIES:
   - OCHamcrest (~> 1.9)
@@ -16,6 +16,6 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   OCHamcrest: f8393efd5a49d91879be573635d6183effacc0ab
   OCMockito: 01560fd24319b85c223e10f52e2e41fbe2c6d434
-  Typhoon: 085031d2a7e327b272435e45dead43f2a30e3fe8
+  Typhoon: 99fca282d720c449f7e02946b42ea9cd8bf57ce8
 
 COCOAPODS: 0.28.0
diff --git a/Tests/Pods/Local Podspecs/Typhoon.podspec b/Tests/Pods/Local Podspecs/Typhoon.podspec
diff --git a/Tests/Pods/Manifest.lock b/Tests/Pods/Manifest.lock
diff --git a/Tests/Pods/Pods-iOS Tests (Cocoapods)-Typhoon.xcconfig b/Tests/Pods/Pods-iOS Tests (Cocoapods)-Typhoon.xcconfig
diff --git a/Tests/Pods/Pods-iOS Tests (Cocoapods)-environment.h b/Tests/Pods/Pods-iOS Tests (Cocoapods)-environment.h
diff --git a/Tests/Pods/Pods-iOS Tests (Cocoapods).xcconfig b/Tests/Pods/Pods-iOS Tests (Cocoapods).xcconfig
diff --git a/Tests/Pods/Pods-osx-Typhoon.xcconfig b/Tests/Pods/Pods-osx-Typhoon.xcconfig
diff --git a/Tests/Pods/Pods-osx-environment.h b/Tests/Pods/Pods-osx-environment.h
diff --git a/Tests/Pods/Pods-osx.xcconfig b/Tests/Pods/Pods-osx.xcconfig