From 1013a4666449ceb8c4bd68e3331e51c80693507a Mon Sep 17 00:00:00 2001 From: Andrew Breckenridge Date: Mon, 11 Jan 2016 20:50:22 -0800 Subject: [PATCH 1/2] remove if check warning --- TTTAttributedLabel/TTTAttributedLabel.m | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/TTTAttributedLabel/TTTAttributedLabel.m b/TTTAttributedLabel/TTTAttributedLabel.m index 184972b5..f766b82e 100644 --- a/TTTAttributedLabel/TTTAttributedLabel.m +++ b/TTTAttributedLabel/TTTAttributedLabel.m @@ -1184,14 +1184,12 @@ - (void)setText:(id)text { } #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 - if (&NSLinkAttributeName) { - [self.attributedText enumerateAttribute:NSLinkAttributeName inRange:NSMakeRange(0, self.attributedText.length) options:0 usingBlock:^(id value, __unused NSRange range, __unused BOOL *stop) { - if (value) { - NSURL *URL = [value isKindOfClass:[NSString class]] ? [NSURL URLWithString:value] : value; - [self addLinkToURL:URL withRange:range]; - } - }]; - } + [self.attributedText enumerateAttribute:NSLinkAttributeName inRange:NSMakeRange(0, self.attributedText.length) options:0 usingBlock:^(id value, __unused NSRange range, __unused BOOL *stop) { + if (value) { + NSURL *URL = [value isKindOfClass:[NSString class]] ? [NSURL URLWithString:value] : value; + [self addLinkToURL:URL withRange:range]; + } + }]; #endif } From 738699a2c6db978fed2d62c4f23bad805eb675a4 Mon Sep 17 00:00:00 2001 From: Andrew Breckenridge Date: Mon, 11 Jan 2016 20:51:10 -0800 Subject: [PATCH 2/2] update xcodeproj --- .../TTTAttributedLabel.xcodeproj/project.pbxproj | 7 ++++++- .../xcschemes/TTTAttributedLabel tvOS.xcscheme | 2 +- .../xcschemes/TTTAttributedLabel.xcscheme | 13 ++++++++----- Carthage/TTTAttributedLabel/Info.plist | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Carthage/TTTAttributedLabel.xcodeproj/project.pbxproj b/Carthage/TTTAttributedLabel.xcodeproj/project.pbxproj index daa50f67..5f2d0992 100644 --- a/Carthage/TTTAttributedLabel.xcodeproj/project.pbxproj +++ b/Carthage/TTTAttributedLabel.xcodeproj/project.pbxproj @@ -138,7 +138,7 @@ A52E641E1B14C0BF002709D4 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0720; TargetAttributes = { A52E64261B14C0BF002709D4 = { CreatedOnToolsVersion = 6.3.2; @@ -211,6 +211,7 @@ INFOPLIST_FILE = TTTAttributedLabel/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = TTTAttributedLabel; SDKROOT = appletvos; SKIP_INSTALL = YES; @@ -229,6 +230,7 @@ INFOPLIST_FILE = TTTAttributedLabel/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = TTTAttributedLabel; SDKROOT = appletvos; SKIP_INSTALL = YES; @@ -258,6 +260,7 @@ CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -336,6 +339,7 @@ INFOPLIST_FILE = TTTAttributedLabel/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; @@ -351,6 +355,7 @@ INFOPLIST_FILE = TTTAttributedLabel/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; diff --git a/Carthage/TTTAttributedLabel.xcodeproj/xcshareddata/xcschemes/TTTAttributedLabel tvOS.xcscheme b/Carthage/TTTAttributedLabel.xcodeproj/xcshareddata/xcschemes/TTTAttributedLabel tvOS.xcscheme index df5a2f77..d0dca82a 100644 --- a/Carthage/TTTAttributedLabel.xcodeproj/xcshareddata/xcschemes/TTTAttributedLabel tvOS.xcscheme +++ b/Carthage/TTTAttributedLabel.xcodeproj/xcshareddata/xcschemes/TTTAttributedLabel tvOS.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:TTTAttributedLabel.xcodeproj"> + + CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.mattt.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName