From fc355c593f00efb872b312b8858f370d6089e75a Mon Sep 17 00:00:00 2001 From: Russ Shevchuk Date: Fri, 18 Sep 2020 15:30:17 -0500 Subject: [PATCH 1/3] fix xcode 12 warnings --- .../Example-iOS/Example-iOS.xcodeproj/project.pbxproj | 8 +++++--- Lib/UICKeyChainStore.xcodeproj/project.pbxproj | 10 ++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj b/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj index 939de18..e6431ce 100644 --- a/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj +++ b/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj @@ -131,7 +131,7 @@ 145BF3EC1A66C24500D01D0D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1140; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = "kishikawa katsumi"; TargetAttributes = { 145BF3F31A66C24500D01D0D = { @@ -207,6 +207,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -231,7 +232,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -261,6 +262,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -278,7 +280,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/Lib/UICKeyChainStore.xcodeproj/project.pbxproj b/Lib/UICKeyChainStore.xcodeproj/project.pbxproj index 7d90afe..591fc48 100644 --- a/Lib/UICKeyChainStore.xcodeproj/project.pbxproj +++ b/Lib/UICKeyChainStore.xcodeproj/project.pbxproj @@ -423,6 +423,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 14796A791C1CDB8A00169D09 /* libUICKeyChainStore.xcconfig */; buildSettings = { + IPHONEOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -430,6 +431,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 14796A791C1CDB8A00169D09 /* libUICKeyChainStore.xcconfig */; buildSettings = { + IPHONEOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; }; @@ -437,6 +439,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 14F2A00B1D8F31A3000B135F /* TestHost.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = "-"; }; name = Debug; }; @@ -444,6 +447,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 14F2A00B1D8F31A3000B135F /* TestHost.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = "-"; }; name = Release; }; @@ -451,6 +455,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 143BF28F1C1CD598002BE6B3 /* Debug.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -458,6 +465,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 143BF2901C1CD598002BE6B3 /* Release.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; }; From 911e304cb48ad30ffc2c9dc4bc09d04a73fc2d11 Mon Sep 17 00:00:00 2001 From: Russ Shevchuk Date: Fri, 18 Sep 2020 15:31:31 -0500 Subject: [PATCH 2/3] Bump version to 2.3.0 --- Lib/UICKeyChainStore/Info.plist | 2 +- UICKeyChainStore.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/UICKeyChainStore/Info.plist b/Lib/UICKeyChainStore/Info.plist index a60ea4a..344518f 100644 --- a/Lib/UICKeyChainStore/Info.plist +++ b/Lib/UICKeyChainStore/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.2.0 + 2.3.0 CFBundleSignature ???? CFBundleVersion diff --git a/UICKeyChainStore.podspec b/UICKeyChainStore.podspec index 24323cb..ef619b1 100644 --- a/UICKeyChainStore.podspec +++ b/UICKeyChainStore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "UICKeyChainStore" - s.version = "2.2.0" + s.version = "2.3.0" s.summary = "UICKeyChainStore is a simple wrapper for Keychain that works on iOS and OS X. Makes using Keychain APIs as easy as NSUserDefaults." s.description = <<-DESC UICKeyChainStore is a simple wrapper for Keychain that works on iOS and OS X. From 8220ac38124613fb709508426f75fbac6921e261 Mon Sep 17 00:00:00 2001 From: Kishikawa Katsumi Date: Sat, 19 Sep 2020 07:29:13 +0900 Subject: [PATCH 3/3] Update for Xcode 12 --- .../Example-iOS.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/xcschemes/Example-iOS.xcscheme | 2 +- Lib/Configurations/Base.xcconfig | 3 ++- Lib/Configurations/libUICKeyChainStore.xcconfig | 2 +- Lib/UICKeyChainStore.xcodeproj/project.pbxproj | 12 +----------- .../xcshareddata/xcschemes/TestHost.xcscheme | 2 +- .../xcshareddata/xcschemes/UICKeyChainStore.xcscheme | 2 +- .../xcschemes/libUICKeyChainStore.xcscheme | 2 +- Lib/UICKeyChainStore/Info.plist | 2 +- UICKeyChainStore.podspec | 2 +- 10 files changed, 12 insertions(+), 21 deletions(-) diff --git a/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj b/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj index e6431ce..3559e6c 100644 --- a/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj +++ b/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj @@ -232,7 +232,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -280,7 +280,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/Examples/Example-iOS/Example-iOS.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme b/Examples/Example-iOS/Example-iOS.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme index 0a2351c..e26577f 100644 --- a/Examples/Example-iOS/Example-iOS.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme +++ b/Examples/Example-iOS/Example-iOS.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme @@ -1,6 +1,6 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.3.0 + 2.2.1 CFBundleSignature ???? CFBundleVersion diff --git a/UICKeyChainStore.podspec b/UICKeyChainStore.podspec index ef619b1..62067ff 100644 --- a/UICKeyChainStore.podspec +++ b/UICKeyChainStore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "UICKeyChainStore" - s.version = "2.3.0" + s.version = "2.2.1" s.summary = "UICKeyChainStore is a simple wrapper for Keychain that works on iOS and OS X. Makes using Keychain APIs as easy as NSUserDefaults." s.description = <<-DESC UICKeyChainStore is a simple wrapper for Keychain that works on iOS and OS X.