From ae0c2cb19fe450657187cf4e129409abd4275bde Mon Sep 17 00:00:00 2001 From: Bertrand Guiheneuf Date: Sat, 19 Oct 2013 15:32:02 +0200 Subject: [PATCH] Fix framework public headers for osx --- doc/Installation.md | 2 +- handlebars-objc.podspec | 2 +- src/handlebars-objc.xcodeproj/project.pbxproj | 2 +- .../Test OSX Embedding.xcodeproj/project.pbxproj | 1 + .../Test OSX Embedding/Test OSX Embedding/AppDelegate.m | 3 ++- .../Test iOS Embedding.xcodeproj/project.pbxproj | 2 ++ 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/Installation.md b/doc/Installation.md index 2afb2f3..2d4fd8e 100644 --- a/doc/Installation.md +++ b/doc/Installation.md @@ -44,5 +44,5 @@ If your project targets iOS: If your project targets OS X: - add handlebars-objc-osx as a target dependency to your target - - link against handlebars-objc-osx.framework + - link against Handlebars.framework diff --git a/handlebars-objc.podspec b/handlebars-objc.podspec index 8ddb587..de2d40e 100644 --- a/handlebars-objc.podspec +++ b/handlebars-objc.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "handlebars-objc" - s.version = "1.0.0" + s.version = "1.0.1" s.summary = "handlebars-objc is an implementation of Handlebars.js for Objective-C" s.homepage = "https://github.com/fotonauts/handlebars-objc" s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/src/handlebars-objc.xcodeproj/project.pbxproj b/src/handlebars-objc.xcodeproj/project.pbxproj index 2e81eaa..1a43dc2 100644 --- a/src/handlebars-objc.xcodeproj/project.pbxproj +++ b/src/handlebars-objc.xcodeproj/project.pbxproj @@ -33,7 +33,7 @@ 0630B1D917F466B800EA7018 /* HBParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 0630B1D717F466B800EA7018 /* HBParser.h */; }; 0630B1DA17F466B800EA7018 /* HBParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 0630B1D817F466B800EA7018 /* HBParser.m */; }; 06345248180F473A003C0B7C /* HBHandlebarsKVCValidation.h in Headers */ = {isa = PBXBuildFile; fileRef = 06345247180F45EE003C0B7C /* HBHandlebarsKVCValidation.h */; }; - 06345249180F473C003C0B7C /* HBHandlebarsKVCValidation.h in Headers */ = {isa = PBXBuildFile; fileRef = 06345247180F45EE003C0B7C /* HBHandlebarsKVCValidation.h */; }; + 06345249180F473C003C0B7C /* HBHandlebarsKVCValidation.h in Headers */ = {isa = PBXBuildFile; fileRef = 06345247180F45EE003C0B7C /* HBHandlebarsKVCValidation.h */; settings = {ATTRIBUTES = (Public, ); }; }; 06556D7F17FEFB0C00070907 /* HBPartial.h in Headers */ = {isa = PBXBuildFile; fileRef = 06556D7D17FEFB0C00070907 /* HBPartial.h */; settings = {ATTRIBUTES = (Public, ); }; }; 06556D8017FEFB0C00070907 /* HBPartial.m in Sources */ = {isa = PBXBuildFile; fileRef = 06556D7E17FEFB0C00070907 /* HBPartial.m */; }; 06556D8317FEFB7C00070907 /* HBPartialRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 06556D8117FEFB7C00070907 /* HBPartialRegistry.h */; settings = {ATTRIBUTES = (Public, ); }; }; diff --git a/src/non-unit-tests/test-embedding-in-projects/Test OSX Embedding/Test OSX Embedding.xcodeproj/project.pbxproj b/src/non-unit-tests/test-embedding-in-projects/Test OSX Embedding/Test OSX Embedding.xcodeproj/project.pbxproj index 1a4e797..fc20c0a 100644 --- a/src/non-unit-tests/test-embedding-in-projects/Test OSX Embedding/Test OSX Embedding.xcodeproj/project.pbxproj +++ b/src/non-unit-tests/test-embedding-in-projects/Test OSX Embedding/Test OSX Embedding.xcodeproj/project.pbxproj @@ -400,6 +400,7 @@ 06AB0B51180BDB9B005A7610 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/src/non-unit-tests/test-embedding-in-projects/Test OSX Embedding/Test OSX Embedding/AppDelegate.m b/src/non-unit-tests/test-embedding-in-projects/Test OSX Embedding/Test OSX Embedding/AppDelegate.m index e2c577f..f3080d1 100644 --- a/src/non-unit-tests/test-embedding-in-projects/Test OSX Embedding/Test OSX Embedding/AppDelegate.m +++ b/src/non-unit-tests/test-embedding-in-projects/Test OSX Embedding/Test OSX Embedding/AppDelegate.m @@ -13,7 +13,8 @@ @implementation AppDelegate - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - NSString* evaluatedTemplate = [HBHandlebars renderTemplateString:@"Hello from {{value}}" withContext:@{ @"value" : @"Handlebars" }]; + NSError* error = nil; + NSString* evaluatedTemplate = [HBHandlebars renderTemplateString:@"Hello from {{value}}" withContext:@{ @"value" : @"Handlebars"} error:&error]; NSLog(@"%@", evaluatedTemplate); } diff --git a/src/non-unit-tests/test-embedding-in-projects/Test iOS Embedding/Test iOS Embedding.xcodeproj/project.pbxproj b/src/non-unit-tests/test-embedding-in-projects/Test iOS Embedding/Test iOS Embedding.xcodeproj/project.pbxproj index 7c33434..115dc76 100644 --- a/src/non-unit-tests/test-embedding-in-projects/Test iOS Embedding/Test iOS Embedding.xcodeproj/project.pbxproj +++ b/src/non-unit-tests/test-embedding-in-projects/Test iOS Embedding/Test iOS Embedding.xcodeproj/project.pbxproj @@ -501,6 +501,7 @@ 06AB0B9F180BDEA4005A7610 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 06AB0BA0180BDEA4005A7610 /* Build configuration list for PBXNativeTarget "Test iOS EmbeddingTests" */ = { isa = XCConfigurationList; @@ -509,6 +510,7 @@ 06AB0BA2180BDEA4005A7610 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ };