Skip to content

Commit

Permalink
Merge pull request #116 from larsacus/Lars-Issue-112
Browse files Browse the repository at this point in the history
Fixing issue #112 w/GCC_NO_COMMON_BLOCKS build setting
  • Loading branch information
cnstoll committed Jun 27, 2016
2 parents 05ef96f + 4b27f59 commit 513dd84
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,7 @@
55F95200165C73460060851E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MMRecordAppDotNet/MMRecordAppDotNet-Prefix.pch";
INFOPLIST_FILE = "MMRecordAppDotNet/MMRecordAppDotNet-Info.plist";
Expand All @@ -790,6 +791,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MMRecordAppDotNet/MMRecordAppDotNet-Prefix.pch";
INFOPLIST_FILE = "MMRecordAppDotNet/MMRecordAppDotNet-Info.plist";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ @interface ADNPostsViewController () <FBTweakViewControllerDelegate>

@property (nonatomic, strong) ADNPostManager *postManager;
@property (nonatomic, copy) NSArray *posts;
@property (nonatomic, strong) UIRefreshControl *refreshControl;

@end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = MMRecordAtlassian/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -427,6 +428,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = MMRecordAtlassian/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MMRecordFoursquare/MMRecordFoursquare-Prefix.pch";
INFOPLIST_FILE = "MMRecordFoursquare/MMRecordFoursquare-Info.plist";
Expand All @@ -715,6 +716,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Distribution";
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MMRecordFoursquare/MMRecordFoursquare-Prefix.pch";
INFOPLIST_FILE = "MMRecordFoursquare/MMRecordFoursquare-Info.plist";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@
9FABD8DA16FA7DC700184BA5 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MMRecordInstagram/Source/MMRecordInstagram-Prefix.pch";
INFOPLIST_FILE = "MMRecordInstagram/SupportingFiles/MMRecordInstagram-Info.plist";
Expand All @@ -666,6 +667,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MMRecordInstagram/Source/MMRecordInstagram-Prefix.pch";
INFOPLIST_FILE = "MMRecordInstagram/SupportingFiles/MMRecordInstagram-Info.plist";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,7 @@
55F95200165C73460060851E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MMRecordAppDotNet/MMRecordPerformance-Prefix.pch";
INFOPLIST_FILE = "MMRecordAppDotNet/MMRecordPerformance-Info.plist";
Expand All @@ -666,6 +667,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MMRecordAppDotNet/MMRecordPerformance-Prefix.pch";
INFOPLIST_FILE = "MMRecordAppDotNet/MMRecordPerformance-Info.plist";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,7 @@
55C6BD1C16FD5416000114DF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MMRecordTwitter/MMRecordTwitter-Prefix.pch";
INFOPLIST_FILE = "MMRecordTwitter/MMRecordTwitter-Info.plist";
Expand All @@ -592,6 +593,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MMRecordTwitter/MMRecordTwitter-Prefix.pch";
INFOPLIST_FILE = "MMRecordTwitter/MMRecordTwitter-Info.plist";
Expand Down
2 changes: 1 addition & 1 deletion Source/MMRecord/MMRecord.m
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ + (NSArray *)objectIDsForRecords:(NSArray *)records

NSError *coreDataError = nil;
if ([backgroundContext save:&coreDataError] == NO) {
NSString *coreDataErrorString = [NSString stringWithFormat:@"Core Data error occurred with code: %d, description: %@",
NSString *coreDataErrorString = [NSString stringWithFormat:@"Core Data error occurred with code: %zd, description: %@",
coreDataError.code,
coreDataError.localizedDescription];
NSString *errorDescription = [NSString stringWithFormat:@"Unable to save background context while populating records. MMRecord import operation unsuccessful. %@",
Expand Down
20 changes: 10 additions & 10 deletions Source/MMRecord/MMRecordDebugger.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ typedef NS_ENUM(NSInteger, MMRecordLoggingLevel) {
};

// MMRecordErrorDomain is the domain used for all errors created and returned by MMRecordDebugger
NSString * const MMRecordErrorDomain;
FOUNDATION_EXTERN NSString * const MMRecordErrorDomain;

/**
MMRecordDebuggerKey can be used to access the instance of MMRecordDebugger on
the error object's userInfo dictionary. You may want to use this to view all
errors encountered on the population process, as well as metadata about the
request itself, including the response object and initial entity.
*/
NSString * const MMRecordDebuggerKey;
FOUNDATION_EXTERN NSString * const MMRecordDebuggerKey;

/**
MMRecordDebuggerParameters are keys used to pass information along to
Expand All @@ -59,14 +59,14 @@ NSString * const MMRecordDebuggerKey;
an error's userInfo dictionary if those objects have been passed into the
handleErrorCode:withParameters: method defined below.
*/
NSString * const MMRecordDebuggerParameterErrorDescription;
NSString * const MMRecordDebuggerParameterResponseObject;
NSString * const MMRecordDebuggerParameterRecordClassName;
NSString * const MMRecordDebuggerParameterKeyPathForResponseObject;
NSString * const MMRecordDebuggerParameterEntityDescription;
NSString * const MMRecordDebuggerParameterPropertyName;
NSString * const MMRecordDebuggerParameterRecordDictionary;
NSString * const MMRecordDebuggerParameterServerClassName;
FOUNDATION_EXTERN NSString * const MMRecordDebuggerParameterErrorDescription;
FOUNDATION_EXTERN NSString * const MMRecordDebuggerParameterResponseObject;
FOUNDATION_EXTERN NSString * const MMRecordDebuggerParameterRecordClassName;
FOUNDATION_EXTERN NSString * const MMRecordDebuggerParameterKeyPathForResponseObject;
FOUNDATION_EXTERN NSString * const MMRecordDebuggerParameterEntityDescription;
FOUNDATION_EXTERN NSString * const MMRecordDebuggerParameterPropertyName;
FOUNDATION_EXTERN NSString * const MMRecordDebuggerParameterRecordDictionary;
FOUNDATION_EXTERN NSString * const MMRecordDebuggerParameterServerClassName;


/**
Expand Down

0 comments on commit 513dd84

Please sign in to comment.