Skip to content

Commit

Permalink
Further fixes for Evernote#104, Evernote#105, #109, and #117
Browse files Browse the repository at this point in the history
Added the "SendToEvernoteActivity" directory to the header search
paths. Including it with the directory worked for CocoaPods with
Objective-C, but not for Swift.

This may cause an error for those including it via a framework, but
since CocoaPods can't deal with this consistently, flattening the
heirarchy will be a better long term fix

Also, bumped to 2.0.6
  • Loading branch information
Jim Dusseau committed Nov 29, 2015
1 parent 19c9b21 commit 4c5cac9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions evernote-cloud-sdk-ios.podspec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Pod::Spec.new do |spec|
spec.name = "evernote-cloud-sdk-ios"
spec.version = "2.0.5"
spec.version = "2.0.6"
spec.summary = "Evernote Cloud SDK for iOS."
spec.homepage = "https://github.com/evernote/evernote-cloud-sdk-ios"
spec.license = ' https://github.com/evernote/evernote-cloud-sdk-ios/blob/master/LICENSE'
spec.authors = { 'Evernote' => '[email protected]' }
spec.source = { :git => "https://github.com/evernote/evernote-cloud-sdk-ios.git", :tag => "2.0.5"}
spec.source = { :git => "https://github.com/evernote/evernote-cloud-sdk-ios.git", :tag => "2.0.6"}
spec.ios.deployment_target = "8.0"
spec.xcconfig = {'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2'}
spec.xcconfig = {'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2 ${PODS_ROOT}/Headers/Public/evernote-cloud-sdk-ios/SendToEvernoteActivity'}

spec.header_mappings_dir = "evernote-sdk-ios/"
spec.source_files = "evernote-sdk-ios/**/*.{h,m}",
Expand Down
2 changes: 1 addition & 1 deletion evernote-sdk-ios/ENSDK/ENSDK.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@
#import "ENSession.h"
#import "ENCommonUtils.h"

#import "SendToEvernoteActivity/ENSaveToEvernoteActivity.h"
#import "ENSaveToEvernoteActivity.h"

Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#import "RMSTokenView.h"
#import "ENNotebookPickerView.h"
#import "ENSDKPrivate.h"
#import "ENSaveToEvernoteActivity.h"

#define kTitleViewHeight 50.0
#define kTagsViewHeight 44.0
Expand Down

0 comments on commit 4c5cac9

Please sign in to comment.