Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eliminated requirement to use -all_load linker flag. #109

Merged
merged 1 commit into from
Nov 28, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Source/Component/TyphoonDefinition+Infrastructure.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
////////////////////////////////////////////////////////////////////////////////


#import "TyphoonLinkerCategoryBugFix.h"
TYPHOON_FIX_CATEGORY_BUG(TyphoonDefinition_Infrastructure)

#import "TyphoonDefinition+Infrastructure.h"
#import "TyphoonPropertyPlaceholderConfigurer.h"
#import "TyphoonResource.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
////////////////////////////////////////////////////////////////////////////////


#import "TyphoonLinkerCategoryBugFix.h"
TYPHOON_FIX_CATEGORY_BUG(TyphoonComponentFactory_InstanceBuilder)

#import <objc/message.h>
#import "TyphoonComponentFactory+InstanceBuilder.h"
#import "TyphoonDefinition.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
//
////////////////////////////////////////////////////////////////////////////////

#import "TyphoonLinkerCategoryBugFix.h"
TYPHOON_FIX_CATEGORY_BUG(TyphoonDefinition_InstanceBuilder)

#import "TyphoonDefinition+InstanceBuilder.h"
#import "TyphoonPropertyInjectedWithStringRepresentation.h"
#import "TyphoonPropertyInjectedByType.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@



#import "TyphoonLinkerCategoryBugFix.h"
TYPHOON_FIX_CATEGORY_BUG(TyphoonInitializer_InstanceBuilder)

#import "TyphoonInitializer+InstanceBuilder.h"
#import "TyphoonParameterInjectedWithStringRepresentation.h"
#import "TyphoonDefinition.h"
Expand Down
3 changes: 3 additions & 0 deletions Source/Factory/Xml/TyphoonRXMLElement+XmlComponentFactory.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@



#import "TyphoonLinkerCategoryBugFix.h"
TYPHOON_FIX_CATEGORY_BUG(TyphoonRXMLElement_XmlComponentFactory)

#import "TyphoonRXMLElement+XmlComponentFactory.h"
#import "TyphoonInjectedProperty.h"
#import "TyphoonPropertyInjectedByReference.h"
Expand Down
3 changes: 3 additions & 0 deletions Source/Utils/NSObject+TyphoonIntrospectionUtils.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@



#import "TyphoonLinkerCategoryBugFix.h"
TYPHOON_FIX_CATEGORY_BUG(NSObject_TyphoonIntrospectionUtils)

#import <objc/runtime.h>
#import "TyphoonTypeDescriptor.h"
#import "TyphoonIntrospectionUtils.h"
Expand Down
25 changes: 25 additions & 0 deletions Source/Utils/TyphoonLinkerCategoryBugFix.h
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions Tests/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PODS:
- OCHamcrest (1.9)
- OCMockito (0.23):
- OCHamcrest
- Typhoon (1.5.4)
- Typhoon (1.5.7)

DEPENDENCIES:
- OCHamcrest (~> 1.9)
Expand All @@ -16,6 +16,6 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
OCHamcrest: f8393efd5a49d91879be573635d6183effacc0ab
OCMockito: 01560fd24319b85c223e10f52e2e41fbe2c6d434
Typhoon: 085031d2a7e327b272435e45dead43f2a30e3fe8
Typhoon: 99fca282d720c449f7e02946b42ea9cd8bf57ce8

COCOAPODS: 0.28.0
4 changes: 2 additions & 2 deletions Tests/Pods/Local Podspecs/Typhoon.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Tests/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tests/Pods/Pods-iOS Tests (Cocoapods)-Typhoon.xcconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tests/Pods/Pods-iOS Tests (Cocoapods)-environment.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tests/Pods/Pods-iOS Tests (Cocoapods).xcconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tests/Pods/Pods-osx-Typhoon.xcconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tests/Pods/Pods-osx-environment.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tests/Pods/Pods-osx.xcconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading