From 72468e1363b4453e592e44f8b40aa4aadb4ec31e Mon Sep 17 00:00:00 2001 From: horex Date: Wed, 18 Oct 2017 14:48:15 +0800 Subject: [PATCH 1/5] convert to swift 4.0 --- NSDateTimeAgo.xcodeproj/project.pbxproj | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/NSDateTimeAgo.xcodeproj/project.pbxproj b/NSDateTimeAgo.xcodeproj/project.pbxproj index 2607386..cfd92c3 100644 --- a/NSDateTimeAgo.xcodeproj/project.pbxproj +++ b/NSDateTimeAgo.xcodeproj/project.pbxproj @@ -195,7 +195,7 @@ }; 833CD3771BCD9BD90085A751 = { CreatedOnToolsVersion = 7.0.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; 83AC39081BD066C500A9C7F7 = { CreatedOnToolsVersion = 7.0.1; @@ -304,6 +304,7 @@ PRODUCT_NAME = NSDateTimeAgo; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -328,6 +329,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -437,7 +439,8 @@ PRODUCT_NAME = NSDateTimeAgo; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -458,7 +461,8 @@ PRODUCT_NAME = NSDateTimeAgo; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -469,7 +473,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.kevinlawler.NSDateTimeAgoTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -481,7 +485,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.kevinlawler.NSDateTimeAgoTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Release; }; From 491800007eef996145f8ef4fbaa2f7b472b21e34 Mon Sep 17 00:00:00 2001 From: horex Date: Mon, 9 Apr 2018 16:20:49 +0800 Subject: [PATCH 2/5] support swift 4.1 --- NSDateTimeAgo.xcodeproj/project.pbxproj | 24 ++++++++++++++++++- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++++++ .../xcschemes/NSDateTimeAgo-OSX.xcscheme | 2 +- .../xcschemes/NSDateTimeAgo.xcscheme | 2 +- 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 NSDateTimeAgo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/NSDateTimeAgo.xcodeproj/project.pbxproj b/NSDateTimeAgo.xcodeproj/project.pbxproj index cfd92c3..8b1857e 100644 --- a/NSDateTimeAgo.xcodeproj/project.pbxproj +++ b/NSDateTimeAgo.xcodeproj/project.pbxproj @@ -187,7 +187,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Kevin Lawler"; TargetAttributes = { 535788311CD03AAB00F72193 = { @@ -341,13 +341,23 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; 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_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + 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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -389,13 +399,23 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; 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_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + 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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -427,6 +447,7 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -449,6 +470,7 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; diff --git a/NSDateTimeAgo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/NSDateTimeAgo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/NSDateTimeAgo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/NSDateTimeAgo.xcodeproj/xcshareddata/xcschemes/NSDateTimeAgo-OSX.xcscheme b/NSDateTimeAgo.xcodeproj/xcshareddata/xcschemes/NSDateTimeAgo-OSX.xcscheme index 98920d1..2206ffa 100644 --- a/NSDateTimeAgo.xcodeproj/xcshareddata/xcschemes/NSDateTimeAgo-OSX.xcscheme +++ b/NSDateTimeAgo.xcodeproj/xcshareddata/xcschemes/NSDateTimeAgo-OSX.xcscheme @@ -1,6 +1,6 @@ Date: Fri, 28 Sep 2018 11:53:21 +0800 Subject: [PATCH 3/5] update Swift to 4.2 --- NSDateTimeAgo.xcodeproj/project.pbxproj | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/NSDateTimeAgo.xcodeproj/project.pbxproj b/NSDateTimeAgo.xcodeproj/project.pbxproj index 8b1857e..22be8da 100644 --- a/NSDateTimeAgo.xcodeproj/project.pbxproj +++ b/NSDateTimeAgo.xcodeproj/project.pbxproj @@ -195,7 +195,7 @@ }; 833CD3771BCD9BD90085A751 = { CreatedOnToolsVersion = 7.0.1; - LastSwiftMigration = 0900; + LastSwiftMigration = ""; }; 83AC39081BD066C500A9C7F7 = { CreatedOnToolsVersion = 7.0.1; @@ -460,8 +460,7 @@ PRODUCT_NAME = NSDateTimeAgo; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -483,8 +482,7 @@ PRODUCT_NAME = NSDateTimeAgo; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; From 31950851b43230f063592927b1204e17d092c0c3 Mon Sep 17 00:00:00 2001 From: bruce Date: Mon, 8 Apr 2019 16:05:17 +0800 Subject: [PATCH 4/5] feature: support swift5 --- NSDateTimeAgo.xcodeproj/project.pbxproj | 15 ++++++++++----- .../xcschemes/NSDateTimeAgo-OSX.xcscheme | 2 +- .../xcshareddata/xcschemes/NSDateTimeAgo.xcscheme | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/NSDateTimeAgo.xcodeproj/project.pbxproj b/NSDateTimeAgo.xcodeproj/project.pbxproj index 22be8da..83570b2 100644 --- a/NSDateTimeAgo.xcodeproj/project.pbxproj +++ b/NSDateTimeAgo.xcodeproj/project.pbxproj @@ -187,7 +187,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Kevin Lawler"; TargetAttributes = { 535788311CD03AAB00F72193 = { @@ -195,7 +195,7 @@ }; 833CD3771BCD9BD90085A751 = { CreatedOnToolsVersion = 7.0.1; - LastSwiftMigration = ""; + LastSwiftMigration = 1020; }; 83AC39081BD066C500A9C7F7 = { CreatedOnToolsVersion = 7.0.1; @@ -205,10 +205,11 @@ }; buildConfigurationList = 833CD3721BCD9BD90085A751 /* Build configuration list for PBXProject "NSDateTimeAgo" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 833CD36E1BCD9BD90085A751; productRefGroup = 833CD3791BCD9BD90085A751 /* Products */; @@ -337,6 +338,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -385,6 +387,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -395,6 +398,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -435,6 +439,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -460,7 +465,7 @@ PRODUCT_NAME = NSDateTimeAgo; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -482,7 +487,7 @@ PRODUCT_NAME = NSDateTimeAgo; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/NSDateTimeAgo.xcodeproj/xcshareddata/xcschemes/NSDateTimeAgo-OSX.xcscheme b/NSDateTimeAgo.xcodeproj/xcshareddata/xcschemes/NSDateTimeAgo-OSX.xcscheme index 2206ffa..0fb4103 100644 --- a/NSDateTimeAgo.xcodeproj/xcshareddata/xcschemes/NSDateTimeAgo-OSX.xcscheme +++ b/NSDateTimeAgo.xcodeproj/xcshareddata/xcschemes/NSDateTimeAgo-OSX.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 2 Nov 2020 11:13:43 +0800 Subject: [PATCH 5/5] update podspec version to 1.2.2 --- NSDate+TimeAgo.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NSDate+TimeAgo.podspec b/NSDate+TimeAgo.podspec index 09204db..2c716f5 100644 --- a/NSDate+TimeAgo.podspec +++ b/NSDate+TimeAgo.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '5.0' s.osx.deployment_target = '10.7' s.name = 'NSDate+TimeAgo' - s.version = '1.0.6' + s.version = '1.2.2' s.summary = 'A "time ago", "time since", "relative date", or "fuzzy date" category for NSDate and iOS, Objective-C, Cocoa Touch, iPhone, iPad.' s.homepage = 'https://github.com/kevinlawler/NSDate-TimeAgo' s.license = { :type => 'ISC', :file => 'LICENSE' }