diff --git a/EvernoteSDK.podspec b/EvernoteSDK.podspec index cce9a8e..2538212 100644 --- a/EvernoteSDK.podspec +++ b/EvernoteSDK.podspec @@ -14,6 +14,6 @@ Pod::Spec.new do |spec| spec.resource = "ENSDKResources.bundle" spec.requires_arc = true - spec.framework = "MobileCoreServices", "CoreGraphics", "Foundation", "UIKit" + spec.framework = "CoreServices", "CoreGraphics", "Foundation", "UIKit", "WebKit" spec.library = "xml2" end diff --git a/EvernoteSDKSample/EvernoteSDKSample.xcodeproj/project.pbxproj b/EvernoteSDKSample/EvernoteSDKSample.xcodeproj/project.pbxproj index 1833433..6571476 100644 --- a/EvernoteSDKSample/EvernoteSDKSample.xcodeproj/project.pbxproj +++ b/EvernoteSDKSample/EvernoteSDKSample.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 030DA2F81E27BCF700FD4BDB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 030DA2F71E27BCF700FD4BDB /* AppDelegate.m */; }; 030DA3001E27BCF700FD4BDB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 030DA2FF1E27BCF700FD4BDB /* Assets.xcassets */; }; 030DA3031E27BCF700FD4BDB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 030DA3011E27BCF700FD4BDB /* LaunchScreen.storyboard */; }; - 030DA3211E27BD4700FD4BDB /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 030DA3201E27BD4700FD4BDB /* MobileCoreServices.framework */; }; 030DA3231E27BD5100FD4BDB /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 030DA3221E27BD5100FD4BDB /* libxml2.tbd */; }; 030DA3361E27BDB700FD4BDB /* CommonUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 030DA3251E27BDB700FD4BDB /* CommonUtils.m */; }; 030DA3371E27BDB700FD4BDB /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 030DA3271E27BDB700FD4BDB /* MainViewController.m */; }; @@ -26,6 +25,7 @@ 030DA3461E27BEEE00FD4BDB /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 030DA3421E27BEEE00FD4BDB /* LICENSE.txt */; }; 030DA3471E27BEEE00FD4BDB /* SVProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 030DA3441E27BEEE00FD4BDB /* SVProgressHUD.m */; }; 038EE1E11E27C1A800595956 /* EvernoteSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 038EE1E01E27C18800595956 /* EvernoteSDK.framework */; }; + 27F202F82433958F00A535EA /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27F202F72433958F00A535EA /* CoreServices.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -60,7 +60,6 @@ 030DA2FF1E27BCF700FD4BDB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 030DA3021E27BCF700FD4BDB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 030DA3041E27BCF700FD4BDB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 030DA3201E27BD4700FD4BDB /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; 030DA3221E27BD5100FD4BDB /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = usr/lib/libxml2.tbd; sourceTree = SDKROOT; }; 030DA3241E27BDB700FD4BDB /* CommonUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonUtils.h; sourceTree = ""; }; 030DA3251E27BDB700FD4BDB /* CommonUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommonUtils.m; sourceTree = ""; }; @@ -85,6 +84,7 @@ 030DA3431E27BEEE00FD4BDB /* SVProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVProgressHUD.h; sourceTree = ""; }; 030DA3441E27BEEE00FD4BDB /* SVProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVProgressHUD.m; sourceTree = ""; }; 038EE1D51E27C18800595956 /* evernote-sdk-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "evernote-sdk-ios.xcodeproj"; path = "../../evernote-sdk-ios.xcodeproj"; sourceTree = ""; }; + 27F202F72433958F00A535EA /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -93,7 +93,7 @@ buildActionMask = 2147483647; files = ( 038EE1E11E27C1A800595956 /* EvernoteSDK.framework in Frameworks */, - 030DA3211E27BD4700FD4BDB /* MobileCoreServices.framework in Frameworks */, + 27F202F82433958F00A535EA /* CoreServices.framework in Frameworks */, 030DA3231E27BD5100FD4BDB /* libxml2.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -162,8 +162,8 @@ 030DA31F1E27BD4700FD4BDB /* Frameworks */ = { isa = PBXGroup; children = ( + 27F202F72433958F00A535EA /* CoreServices.framework */, 030DA3221E27BD5100FD4BDB /* libxml2.tbd */, - 030DA3201E27BD4700FD4BDB /* MobileCoreServices.framework */, ); name = Frameworks; sourceTree = ""; @@ -238,6 +238,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); diff --git a/EvernoteSDKSample/EvernoteSDKSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/EvernoteSDKSample/EvernoteSDKSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/EvernoteSDKSample/EvernoteSDKSample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/README.md b/README.md index a84a1f0..27caa2c 100755 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Drag & Drop `evernote-sdk-ios.xcodeproj` into your project. Now open your target's `Build Phases` and add the following items to your `Link Binary With Libraries` section: - EvernoteSDKiOS.framework -- MobileCoreServices.framework +- CoreServices.framework - libxml2.dylib ## Configuration diff --git a/evernote-cloud-sdk-ios.podspec b/evernote-cloud-sdk-ios.podspec index 1a594b7..ba93fa9 100644 --- a/evernote-cloud-sdk-ios.podspec +++ b/evernote-cloud-sdk-ios.podspec @@ -14,7 +14,7 @@ Pod::Spec.new do |spec| spec.resource = "ENSDKResources.bundle" spec.requires_arc = true - spec.framework = "MobileCoreServices", "CoreGraphics", "Foundation", "UIKit" + spec.framework = "CoreServices", "CoreGraphics", "Foundation", "UIKit" spec.library = "xml2" spec.deprecated_in_favor_of = "EvernoteSDK" diff --git a/evernote-sdk-ios.xcodeproj/project.pbxproj b/evernote-sdk-ios.xcodeproj/project.pbxproj index 868f4ce..aeb1183 100755 --- a/evernote-sdk-ios.xcodeproj/project.pbxproj +++ b/evernote-sdk-ios.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 0BB3D1B11524ED96001C4534 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BB3D1B01524ED96001C4534 /* Foundation.framework */; }; + 27F202FB243395FD00A535EA /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27F202FA243395FD00A535EA /* CoreServices.framework */; }; 6D9D5FFC1E23AC27001740D8 /* EDAMAuthenticationTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D9D5FFA1E23AC27001740D8 /* EDAMAuthenticationTypes.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6D9D5FFD1E23AC27001740D8 /* EDAMAuthenticationTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D9D5FFB1E23AC27001740D8 /* EDAMAuthenticationTypes.m */; }; 6D9D60BF1E279424001740D8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BB3D1B01524ED96001C4534 /* Foundation.framework */; }; @@ -505,6 +506,7 @@ 0BB3D1B01524ED96001C4534 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 0BB3D1B41524ED96001C4534 /* evernote-sdk-ios-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "evernote-sdk-ios-Prefix.pch"; sourceTree = ""; }; 0BB3D24D1524EEF3001C4534 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + 27F202FA243395FD00A535EA /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/CoreServices.framework; sourceTree = DEVELOPER_DIR; }; 6D9D5FFA1E23AC27001740D8 /* EDAMAuthenticationTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EDAMAuthenticationTypes.h; sourceTree = ""; }; 6D9D5FFB1E23AC27001740D8 /* EDAMAuthenticationTypes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EDAMAuthenticationTypes.m; sourceTree = ""; }; 6D9D60B71E27940A001740D8 /* EvernoteSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = EvernoteSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -648,7 +650,6 @@ BE2E245A18EBA5D500BD7E6E /* ENSaveToEvernoteActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ENSaveToEvernoteActivity.h; sourceTree = ""; }; BE2E245B18EBA5D500BD7E6E /* ENSaveToEvernoteActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ENSaveToEvernoteActivity.m; sourceTree = ""; }; BE2E24E818EDD4A300BD7E6E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - BE2E25B018EDE1C100BD7E6E /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; BE2E25D718F4D6C200BD7E6E /* ENMLConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ENMLConstants.h; sourceTree = ""; }; BE2E25D818F4D6C200BD7E6E /* ENMLConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ENMLConstants.m; sourceTree = ""; }; BE2E25DC18F4DCE600BD7E6E /* ENSDKPrivate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ENSDKPrivate.m; sourceTree = ""; }; @@ -709,6 +710,7 @@ buildActionMask = 2147483647; files = ( 6D9D61691E2796FC001740D8 /* libxml2.2.tbd in Frameworks */, + 27F202FB243395FD00A535EA /* CoreServices.framework in Frameworks */, 6D9D60BF1E279424001740D8 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -758,8 +760,8 @@ 0BB3D1AF1524ED96001C4534 /* Frameworks */ = { isa = PBXGroup; children = ( + 27F202FA243395FD00A535EA /* CoreServices.framework */, 6D9D61681E2796FC001740D8 /* libxml2.2.tbd */, - BE2E25B018EDE1C100BD7E6E /* MobileCoreServices.framework */, A9BE476B1781FAFA00471BF7 /* libxml2.dylib */, 0BB3D1B01524ED96001C4534 /* Foundation.framework */, 0BB3D24D1524EEF3001C4534 /* UIKit.framework */, @@ -1427,7 +1429,7 @@ 0BB3D1A41524ED96001C4534 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0820; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = "Evernote Corporation"; TargetAttributes = { 6D9D60B61E27940A001740D8 = { @@ -1442,6 +1444,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, "zh-cn", Base, @@ -1790,12 +1793,18 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -1839,12 +1848,18 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -1923,7 +1938,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; @@ -1961,7 +1976,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; diff --git a/evernote-sdk-ios.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/evernote-sdk-ios.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/evernote-sdk-ios.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/evernote-sdk-ios/ENSDK/Advanced/ENNoteStoreClient.h b/evernote-sdk-ios/ENSDK/Advanced/ENNoteStoreClient.h index ee0ef1c..8efa7d0 100644 --- a/evernote-sdk-ios/ENSDK/Advanced/ENNoteStoreClient.h +++ b/evernote-sdk-ios/ENSDK/Advanced/ENNoteStoreClient.h @@ -962,7 +962,7 @@ DEPRECATED_MSG_ATTRIBUTE("Use -createTag:completion: instead") NS_SWIFT_UNAVAILA DEPRECATED_MSG_ATTRIBUTE("Use -updateTag:completion: instead") NS_SWIFT_UNAVAILABLE("Deprecated"); - (void)untagAllWithGuid:(EDAMGuid)guid - success:(void(^)())success + success:(void(^)(void))success failure:(void(^)(NSError *error))failure DEPRECATED_MSG_ATTRIBUTE("Use -untagAllWithGuid:completion: instead") NS_SWIFT_UNAVAILABLE("Deprecated"); @@ -1256,7 +1256,7 @@ DEPRECATED_MSG_ATTRIBUTE("Use -authenticateToSharedNotebook:completion: instead" DEPRECATED_MSG_ATTRIBUTE("Use -getSharedNotebookByAuthWithCompletion: instead") NS_SWIFT_UNAVAILABLE("Deprecated"); - (void)emailNoteWithParameters:(EDAMNoteEmailParameters *)parameters - success:(void(^)())success + success:(void(^)(void))success failure:(void(^)(NSError *error))failure DEPRECATED_MSG_ATTRIBUTE("Use -emailNoteWithParameters:completion: instead") NS_SWIFT_UNAVAILABLE("Deprecated"); @@ -1266,7 +1266,7 @@ DEPRECATED_MSG_ATTRIBUTE("Use -emailNoteWithParameters:completion: instead") NS_ DEPRECATED_MSG_ATTRIBUTE("Use -shareNoteWithGuid:completion: instead") NS_SWIFT_UNAVAILABLE("Deprecated"); - (void)stopSharingNoteWithGuid:(EDAMGuid)guid - success:(void(^)())success + success:(void(^)(void))success failure:(void(^)(NSError *error))failure DEPRECATED_MSG_ATTRIBUTE("Use -stopSharingNoteWithGuid:completion: instead") NS_SWIFT_UNAVAILABLE("Deprecated"); diff --git a/evernote-sdk-ios/ENSDK/Advanced/ENNoteStoreClient.m b/evernote-sdk-ios/ENSDK/Advanced/ENNoteStoreClient.m index 0c575b2..a282a45 100644 --- a/evernote-sdk-ios/ENSDK/Advanced/ENNoteStoreClient.m +++ b/evernote-sdk-ios/ENSDK/Advanced/ENNoteStoreClient.m @@ -1023,7 +1023,7 @@ - (void)updateTag:(EDAMTag *)tag } - (void)untagAllWithGuid:(EDAMGuid)guid - success:(void(^)())success + success:(void(^)(void))success failure:(void(^)(NSError *error))failure { [self untagAllWithGuid:guid completion:^(NSError * _Nonnull error) { @@ -1569,7 +1569,7 @@ - (void)getSharedNotebookByAuthWithSuccess:(void(^)(EDAMSharedNotebook *sharedNo } - (void)emailNoteWithParameters:(EDAMNoteEmailParameters *)parameters - success:(void(^)())success + success:(void(^)(void))success failure:(void(^)(NSError *error))failure { [self emailNoteWithParameters:parameters completion:^(NSError * _Nonnull error) { @@ -1587,7 +1587,7 @@ - (void)shareNoteWithGuid:(EDAMGuid)guid } - (void)stopSharingNoteWithGuid:(EDAMGuid)guid - success:(void(^)())success + success:(void(^)(void))success failure:(void(^)(NSError *error))failure { [self stopSharingNoteWithGuid:guid completion:^(NSError * _Nonnull error) { diff --git a/evernote-sdk-ios/ENSDK/Advanced/ENUserStoreClient.h b/evernote-sdk-ios/ENSDK/Advanced/ENUserStoreClient.h index a6bb949..132f57b 100644 --- a/evernote-sdk-ios/ENSDK/Advanced/ENUserStoreClient.h +++ b/evernote-sdk-ios/ENSDK/Advanced/ENUserStoreClient.h @@ -150,7 +150,7 @@ NS_ASSUME_NONNULL_BEGIN DEPRECATED_MSG_ATTRIBUTE("Use -authenticateToBusinessWithCompletion: instead") NS_SWIFT_UNAVAILABLE("Deprecated"); - (void)revokeLongSessionWithAuthenticationToken:(NSString*)authenticationToken - success:(void(^)())success + success:(void(^)(void))success failure:(void(^)(NSError *error))failure DEPRECATED_MSG_ATTRIBUTE("Use -revokeLongSessionWithAuthenticationToken:completion: instead") NS_SWIFT_UNAVAILABLE("Deprecated"); @end diff --git a/evernote-sdk-ios/ENSDK/Advanced/ENUserStoreClient.m b/evernote-sdk-ios/ENSDK/Advanced/ENUserStoreClient.m index e43ffcf..cd0064a 100644 --- a/evernote-sdk-ios/ENSDK/Advanced/ENUserStoreClient.m +++ b/evernote-sdk-ios/ENSDK/Advanced/ENUserStoreClient.m @@ -192,7 +192,7 @@ - (void)authenticateToBusinessWithSuccess:(void(^)(EDAMAuthenticationResult *aut } - (void)revokeLongSessionWithAuthenticationToken:(NSString*)authenticationToken - success:(void(^)())success + success:(void(^)(void))success failure:(void(^)(NSError *error))failure { [self revokeLongSessionWithAuthenticationToken:authenticationToken completion:^(NSError *error) { (error == nil) ? success() : failure(error); diff --git a/evernote-sdk-ios/ENSDK/Advanced/Utilities/ENMLWriter/ENMIMEUtils.m b/evernote-sdk-ios/ENSDK/Advanced/Utilities/ENMLWriter/ENMIMEUtils.m index d5a5b9d..905c24f 100644 --- a/evernote-sdk-ios/ENSDK/Advanced/Utilities/ENMLWriter/ENMIMEUtils.m +++ b/evernote-sdk-ios/ENSDK/Advanced/Utilities/ENMLWriter/ENMIMEUtils.m @@ -31,11 +31,7 @@ #import "ENSDKAdvanced.h" #import "ENMLConstants.h" -#if TARGET_OS_IPHONE -# import -#else # import -#endif @implementation ENMIMEUtils diff --git a/evernote-sdk-ios/ENSDK/ENCommonUtils.h b/evernote-sdk-ios/ENSDK/ENCommonUtils.h index 1b32d2c..10e4c75 100644 --- a/evernote-sdk-ios/ENSDK/ENCommonUtils.h +++ b/evernote-sdk-ios/ENSDK/ENCommonUtils.h @@ -10,7 +10,7 @@ @interface ENCommonUtils : NSObject -BOOL IsIOS8(); -BOOL IsEvernoteInstalled(); +BOOL IsIOS8(void); +BOOL IsEvernoteInstalled(void); @end diff --git a/evernote-sdk-ios/ENSDK/ENNote.h b/evernote-sdk-ios/ENSDK/ENNote.h index 533afa1..0839603 100644 --- a/evernote-sdk-ios/ENSDK/ENNote.h +++ b/evernote-sdk-ios/ENSDK/ENNote.h @@ -27,11 +27,12 @@ */ #import +#import @class ENNote; @class ENResource; @class ENNotebook; @class ENNoteContent; -@class UIWebView; +@class WKWebView; NS_ASSUME_NONNULL_BEGIN @@ -91,7 +92,7 @@ typedef void (^ENNoteGenerateWebArchiveDataCompletionHandler)(NSData *_Nullable /** * A note can be rendered for the user within a web view. This method generates a web archive from the - * receiver's content. This archive is a single data object that can be given to a UIWebView's -loadData:... + * receiver's content. This archive is a single data object that can be given to a WKWebView's -loadData:... * method, using the MIME type defined as ENWebArchiveDataMIMEType. This method is asynchronous, but does * not operate using any remote resources; it can generally be safely used without e.g. a background * thread/progress indicator. @@ -101,7 +102,7 @@ typedef void (^ENNoteGenerateWebArchiveDataCompletionHandler)(NSData *_Nullable - (void)generateWebArchiveData:(ENNoteGenerateWebArchiveDataCompletionHandler)completion; /** - * Class method to create and populate a note object from a loaded UIWebView of your content. The styled contents + * Class method to create and populate a note object from a loaded WKWebView of your content. The styled contents * of the DOM as currently loaded are captured into the content of the note. Remote images (i.e. in tags) * are captured as resources. (CSS-based images are not pulled in as resources, but will remain remote links in * the resulting note.) @@ -111,10 +112,10 @@ typedef void (^ENNoteGenerateWebArchiveDataCompletionHandler)(NSData *_Nullable * completely support general-purpose web page capture and reproduction; it will not work well in a * generic "web clipping to Evernote" feature. * - * @param webView A UIWebView (on or offscreen) that contains loaded web content for capture. + * @param webView A WKWebView (on or offscreen) that contains loaded web content for capture. * @param completion A prepopulated note object appropriate for upload. */ -+ (void)populateNoteFromWebView:(UIWebView *)webView completion:(ENNotePopulateFromWebViewCompletionHandler)completion; ++ (void)populateNoteFromWebView:(WKWebView *)webView completion:(ENNotePopulateFromWebViewCompletionHandler)completion; @end NS_ASSUME_NONNULL_END diff --git a/evernote-sdk-ios/ENSDK/ENNote.m b/evernote-sdk-ios/ENSDK/ENNote.m index 9ad2989..08a8139 100644 --- a/evernote-sdk-ios/ENSDK/ENNote.m +++ b/evernote-sdk-ios/ENSDK/ENNote.m @@ -159,7 +159,7 @@ - (void)generateWebArchiveData:(ENNoteGenerateWebArchiveDataCompletionHandler)co // note was not captured from a web page), then just make one up. In this case we use a dummy hostname, and just use the // resource's hash as a fake filename with an appropriate extension. // - // This would be cleaner if we didn't require the totally fake hostname, but using any non-absolute path here confuses UIWebView. + // This would be cleaner if we didn't require the totally fake hostname, but using any non-absolute path here confuses WKWebView. // NSMutableArray * edamResources = [NSMutableArray arrayWithCapacity:self.resources.count]; for (ENResource * resource in self.resources) { @@ -211,7 +211,7 @@ - (void)generateWebArchiveData:(ENNoteGenerateWebArchiveDataCompletionHandler)co }]; } -+ (void)populateNoteFromWebView:(UIWebView *)webView completion:(ENNotePopulateFromWebViewCompletionHandler)completion ++ (void)populateNoteFromWebView:(WKWebView *)webView completion:(ENNotePopulateFromWebViewCompletionHandler)completion { if (!completion) { ENSDKLogError(@"+populateNoteFromWebView requires a valid completion block"); diff --git a/evernote-sdk-ios/ENSDK/ENNoteContent.h b/evernote-sdk-ios/ENSDK/ENNoteContent.h index a48e621..80b5963 100644 --- a/evernote-sdk-ios/ENSDK/ENNoteContent.h +++ b/evernote-sdk-ios/ENSDK/ENNoteContent.h @@ -58,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN * "Sanitized" HTML means that any desired CSS styles are inlined into the DOM (versus being * remote resources or a single