From 1d520077eedd694f665b7fa7705630727b1ab769 Mon Sep 17 00:00:00 2001 From: Ilana Haddad Date: Mon, 29 Jan 2024 12:24:44 -0500 Subject: [PATCH 1/2] fixing build import foundation --- MGTemplateEngine.h | 1 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ MGTemplateFilter.h | 2 ++ MGTemplateStandardFilters.h | 2 +- MGTemplateStandardFilters.m | 3 ++- NSArray_DeepMutableCopy.h | 2 ++ NSArray_DeepMutableCopy.m | 2 +- NSDictionary_DeepMutableCopy.h | 2 ++ 8 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 MGTemplateEngine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/MGTemplateEngine.h b/MGTemplateEngine.h index 73f4183..01d53b8 100644 --- a/MGTemplateEngine.h +++ b/MGTemplateEngine.h @@ -13,6 +13,7 @@ #define BLOCK_VARIABLES_KEY @"vars" // NSDictionary of variables #define TEMPLATE_ENGINE_ERROR_DOMAIN @"MGTemplateEngineErrorDomain" +#import @class MGTemplateEngine; @protocol MGTemplateEngineDelegate diff --git a/MGTemplateEngine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/MGTemplateEngine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/MGTemplateEngine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/MGTemplateFilter.h b/MGTemplateFilter.h index 7578e25..18f2b19 100644 --- a/MGTemplateFilter.h +++ b/MGTemplateFilter.h @@ -6,6 +6,8 @@ * */ +#import + @protocol MGTemplateFilter - (NSArray *)filters; diff --git a/MGTemplateStandardFilters.h b/MGTemplateStandardFilters.h index 335b071..7504ab0 100644 --- a/MGTemplateStandardFilters.h +++ b/MGTemplateStandardFilters.h @@ -6,7 +6,7 @@ // #import "MGTemplateFilter.h" - +#import @interface MGTemplateStandardFilters : NSObject { diff --git a/MGTemplateStandardFilters.m b/MGTemplateStandardFilters.m index d5c73fc..732c913 100644 --- a/MGTemplateStandardFilters.m +++ b/MGTemplateStandardFilters.m @@ -6,7 +6,8 @@ // #import "MGTemplateStandardFilters.h" - +#import +#import #define UPPERCASE @"uppercase" #define LOWERCASE @"lowercase" diff --git a/NSArray_DeepMutableCopy.h b/NSArray_DeepMutableCopy.h index 9f619d0..58e4d83 100644 --- a/NSArray_DeepMutableCopy.h +++ b/NSArray_DeepMutableCopy.h @@ -5,6 +5,8 @@ // Copyright 2008 Instinctive Code. All rights reserved. // +#import + @interface NSArray (DeepMutableCopy) - (NSMutableArray *)deepMutableCopy; diff --git a/NSArray_DeepMutableCopy.m b/NSArray_DeepMutableCopy.m index 961461f..4d35c67 100644 --- a/NSArray_DeepMutableCopy.m +++ b/NSArray_DeepMutableCopy.m @@ -6,7 +6,7 @@ // #import "NSArray_DeepMutableCopy.h" - +#import @implementation NSArray (DeepMutableCopy) diff --git a/NSDictionary_DeepMutableCopy.h b/NSDictionary_DeepMutableCopy.h index 7f94acd..ce6d911 100644 --- a/NSDictionary_DeepMutableCopy.h +++ b/NSDictionary_DeepMutableCopy.h @@ -5,6 +5,8 @@ // Copyright 2008 Instinctive Code. All rights reserved. // +#import + @interface NSDictionary (DeepMutableCopy) - (NSMutableDictionary *)deepMutableCopy; From c95a9bfd080626ef54182f80d663927919c0b4cc Mon Sep 17 00:00:00 2001 From: Ilana Haddad Date: Wed, 31 Jan 2024 16:13:28 -0500 Subject: [PATCH 2/2] fix deprecated errors --- MGTemplateStandardFilters.m | 2 +- MGTemplateStandardMarkers.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MGTemplateStandardFilters.m b/MGTemplateStandardFilters.m index 732c913..49c8ef0 100644 --- a/MGTemplateStandardFilters.m +++ b/MGTemplateStandardFilters.m @@ -85,7 +85,7 @@ - (id)filterInvoked:(NSString *)filter withArguments:(NSArray *)args onValue:(id (unsigned int)(components[2] * 255)]; return colorHex; #else - NSColor *color = [(NSColor *)value colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + NSColor *color = [(NSColor *)value colorUsingColorSpace:NSColorSpace.genericRGBColorSpace]; if (!color) { // happens if the colorspace couldn't be converted return @"000000"; // black } else { diff --git a/MGTemplateStandardMarkers.m b/MGTemplateStandardMarkers.m index a99c629..ca61a86 100644 --- a/MGTemplateStandardMarkers.m +++ b/MGTemplateStandardMarkers.m @@ -73,7 +73,7 @@ @implementation MGTemplateStandardMarkers { - __weak MGTemplateEngine *engine; // weak ref + MGTemplateEngine *engine; // weak ref NSMutableArray *forStack; NSMutableArray *sectionStack; NSMutableArray *ifStack;