From ea08e08958890043019d248065fe3d825f338087 Mon Sep 17 00:00:00 2001 From: Iftekhar Date: Thu, 15 Jun 2023 21:01:49 +0530 Subject: [PATCH] - Changed angle brackets to quoted brakets - Updated minimum deployment target to 11.0 for Xcode 14.3.1 compatibility. --- Demo.xcodeproj/project.pbxproj | 100 +++++++++++++----- ...ITests.xcscheme => DemoExtension.xcscheme} | 81 +++++++------- .../xcshareddata/xcschemes/DemoObjC.xcscheme | 2 +- .../xcshareddata/xcschemes/DemoSwift.xcscheme | 2 +- .../ViewController/CustomViewController.m | 6 +- .../ManualToolbarViewController.m | 6 +- .../RefreshLayoutViewController.m | 2 +- .../Settings/SettingsViewController.m | 2 +- .../SpecialCaseViewController.m | 6 +- .../ViewController/TextFieldViewController.m | 6 +- .../TextViewSpecialCaseViewController.m | 2 +- .../ViewController/ViewController.m | 2 +- .../ViewController/TextViewController.swift | 2 + IQKeyboardManager.podspec.json | 6 +- IQKeyboardManager/Categories/IQNSArray+Sort.h | 2 +- IQKeyboardManager/Categories/IQNSArray+Sort.m | 3 +- .../Categories/IQUIScrollView+Additions.h | 3 +- .../Categories/IQUIScrollView+Additions.m | 3 +- .../Categories/IQUITextFieldView+Additions.h | 5 +- .../Categories/IQUITextFieldView+Additions.m | 3 +- .../Categories/IQUIView+Hierarchy.h | 6 +- .../Categories/IQUIView+Hierarchy.m | 17 +-- .../Categories/IQUIViewController+Additions.h | 2 +- .../Categories/IQUIViewController+Additions.m | 6 +- .../Constants/IQKeyboardManagerConstants.h | 2 +- IQKeyboardManager/IQKeyboardManager.h | 36 +++---- IQKeyboardManager/IQKeyboardManager.m | 31 +----- .../IQKeyboardReturnKeyHandler.h | 8 +- .../IQKeyboardReturnKeyHandler.m | 6 +- IQKeyboardManager/IQTextView/IQTextView.h | 5 +- IQKeyboardManager/IQTextView/IQTextView.m | 6 +- IQKeyboardManager/IQToolbar/IQBarButtonItem.h | 2 +- IQKeyboardManager/IQToolbar/IQBarButtonItem.m | 4 +- .../IQToolbar/IQPreviousNextView.h | 2 +- .../IQToolbar/IQTitleBarButtonItem.h | 7 +- .../IQToolbar/IQTitleBarButtonItem.m | 4 +- IQKeyboardManager/IQToolbar/IQToolbar.h | 6 +- IQKeyboardManager/IQToolbar/IQToolbar.m | 5 +- .../IQToolbar/IQUIView+IQKeyboardToolbar.h | 6 +- .../IQToolbar/IQUIView+IQKeyboardToolbar.m | 12 +-- IQKeyboardManagerSwift.podspec.json | 10 +- Package.swift | 2 +- Podfile | 4 +- Podfile.lock | 24 +++-- 44 files changed, 236 insertions(+), 221 deletions(-) rename Demo.xcodeproj/xcshareddata/xcschemes/{DemoObjCUITests.xcscheme => DemoExtension.xcscheme} (56%) diff --git a/Demo.xcodeproj/project.pbxproj b/Demo.xcodeproj/project.pbxproj index c090fe30b..0a7c0c7cd 100644 --- a/Demo.xcodeproj/project.pbxproj +++ b/Demo.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 53; objects = { /* Begin PBXBuildFile section */ @@ -63,7 +63,7 @@ C03C9470273CF3FF00AF66B5 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C03C946F273CF3FF00AF66B5 /* Media.xcassets */; }; C03C9472273CF3FF00AF66B5 /* ActionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C03C9471273CF3FF00AF66B5 /* ActionViewController.swift */; }; C03C9475273CF3FF00AF66B5 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C03C9473273CF3FF00AF66B5 /* MainInterface.storyboard */; }; - C03C9479273CF3FF00AF66B5 /* DemoExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = C03C946D273CF3FF00AF66B5 /* DemoExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + C03C9479273CF3FF00AF66B5 /* DemoExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = C03C946D273CF3FF00AF66B5 /* DemoExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; C0B63BA01781FAB1008D3B64 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0B63B9F1781FAB1008D3B64 /* UIKit.framework */; }; C0B63BA21781FAB1008D3B64 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0B63BA11781FAB1008D3B64 /* Foundation.framework */; }; C0B63BA41781FAB1008D3B64 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0B63BA31781FAB1008D3B64 /* CoreGraphics.framework */; }; @@ -122,15 +122,15 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - C03C947B273CF3FF00AF66B5 /* Embed App Extensions */ = { + C03C947B273CF3FF00AF66B5 /* Embed Foundation Extensions */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 13; files = ( - C03C9479273CF3FF00AF66B5 /* DemoExtension.appex in Embed App Extensions */, + C03C9479273CF3FF00AF66B5 /* DemoExtension.appex in Embed Foundation Extensions */, ); - name = "Embed App Extensions"; + name = "Embed Foundation Extensions"; runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ @@ -720,7 +720,7 @@ C0ACB0F319CF104B0057B571 /* Resources */, C0B6F1C124F668D6009A24B2 /* SwiftLint */, 17B2CF02857B50C3053DFA79 /* [CP] Embed Pods Frameworks */, - C03C947B273CF3FF00AF66B5 /* Embed App Extensions */, + C03C947B273CF3FF00AF66B5 /* Embed Foundation Extensions */, ); buildRules = ( ); @@ -757,10 +757,11 @@ C0B63B921781FAB0008D3B64 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; LastSwiftMigration = 0700; LastSwiftUpdateCheck = 1250; - LastUpgradeCheck = 1220; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = Iftekhar; TargetAttributes = { 4CE6119C1B98B7250020591A = { @@ -869,12 +870,12 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-DemoSwift/Pods-DemoSwift-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/IQDropDownTextField/IQDropDownTextField.framework", + "${BUILT_PRODUCTS_DIR}/IQDropDownTextFieldSwift/IQDropDownTextFieldSwift.framework", "${BUILT_PRODUCTS_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQDropDownTextField.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQDropDownTextFieldSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManagerSwift.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -1236,7 +1237,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = DemoObjCUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = com.iftekhar.DemoObjCUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1260,7 +1266,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = DemoObjCUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = com.iftekhar.DemoObjCUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1293,7 +1304,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = DemoExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.5; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.infoenumapps.IQKeyboardManagerSwift.extension; @@ -1333,7 +1349,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = DemoExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.5; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.infoenumapps.IQKeyboardManagerSwift.extension; @@ -1359,6 +1380,7 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_LITERAL_CONVERSION = NO; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_ENTITLEMENTS = DemoSwift.entitlements; @@ -1370,15 +1392,18 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = Demo/Swift_Demo/Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - "IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.5; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 6.5; MTL_ENABLE_DEBUG_INFO = YES; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.infoenumapps.IQKeyboardManagerSwift; PRODUCT_NAME = DemoSwift; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = YES; + SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "Demo/Swift_Demo/Resources/IQKeyboardManger-Swift-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1401,6 +1426,7 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_LITERAL_CONVERSION = NO; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO; CLANG_WARN_UNREACHABLE_CODE = YES; CODE_SIGN_ENTITLEMENTS = DemoSwift.entitlements; @@ -1412,15 +1438,18 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = Demo/Swift_Demo/Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - "IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.5; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 6.5; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.infoenumapps.IQKeyboardManagerSwift; PRODUCT_NAME = DemoSwift; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = YES; + SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OBJC_BRIDGING_HEADER = "Demo/Swift_Demo/Resources/IQKeyboardManger-Swift-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -1454,7 +1483,7 @@ CLANG_WARN_OBJC_LITERAL_CONVERSION = NO; CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = NO; CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO; @@ -1493,7 +1522,7 @@ GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; MACOSX_DEPLOYMENT_TARGET = 10.10; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "$(inherited)"; @@ -1527,7 +1556,7 @@ CLANG_WARN_OBJC_LITERAL_CONVERSION = NO; CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = NO; CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO; @@ -1559,12 +1588,13 @@ GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.4; MACOSX_DEPLOYMENT_TARGET = 10.10; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; OTHER_SWIFT_FLAGS = "$(inherited)"; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -1576,10 +1606,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; CLANG_ENABLE_MODULES = YES; + CLANG_MODULES_AUTOLINK = NO; CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES; CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; CODE_SIGN_IDENTITY = "iPhone Developer: Iftekhar Qurashi (RFN29V7Q6Y)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 6.5.8; @@ -1594,12 +1626,19 @@ GCC_WARN_UNUSED_PARAMETER = NO; INFOPLIST_FILE = Demo/Objective_C_Demo/Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 6.5; PRODUCT_BUNDLE_IDENTIFIER = com.iftekhar.IQKeyboardManager; PRODUCT_NAME = IQKeyboardManagerDemo; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; @@ -1613,10 +1652,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; CLANG_ENABLE_MODULES = YES; + CLANG_MODULES_AUTOLINK = NO; CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES; CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; CODE_SIGN_IDENTITY = "iPhone Developer: Iftekhar Qurashi (RFN29V7Q6Y)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 6.5.8; @@ -1631,12 +1672,19 @@ GCC_WARN_UNUSED_PARAMETER = NO; INFOPLIST_FILE = Demo/Objective_C_Demo/Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 6.5; PRODUCT_BUNDLE_IDENTIFIER = com.iftekhar.IQKeyboardManager; PRODUCT_NAME = IQKeyboardManagerDemo; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; diff --git a/Demo.xcodeproj/xcshareddata/xcschemes/DemoObjCUITests.xcscheme b/Demo.xcodeproj/xcshareddata/xcschemes/DemoExtension.xcscheme similarity index 56% rename from Demo.xcodeproj/xcshareddata/xcschemes/DemoObjCUITests.xcscheme rename to Demo.xcodeproj/xcshareddata/xcschemes/DemoExtension.xcscheme index 9e820cc00..7fb339bba 100644 --- a/Demo.xcodeproj/xcshareddata/xcschemes/DemoObjCUITests.xcscheme +++ b/Demo.xcodeproj/xcshareddata/xcschemes/DemoExtension.xcscheme @@ -1,7 +1,8 @@ + LastUpgradeVersion = "1430" + wasCreatedForAppExtension = "YES" + version = "2.0"> @@ -9,14 +10,28 @@ + + + + @@ -27,63 +42,49 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - - - - - - + allowLocationSimulation = "YES" + launchAutomaticallySubstyle = "2"> + - + - + debugDocumentVersioning = "YES" + launchAutomaticallySubstyle = "2"> + - + diff --git a/Demo.xcodeproj/xcshareddata/xcschemes/DemoObjC.xcscheme b/Demo.xcodeproj/xcshareddata/xcschemes/DemoObjC.xcscheme index 9a16686c4..7bc29b360 100644 --- a/Demo.xcodeproj/xcshareddata/xcschemes/DemoObjC.xcscheme +++ b/Demo.xcodeproj/xcshareddata/xcschemes/DemoObjC.xcscheme @@ -1,6 +1,6 @@ +#import +#import @interface CustomViewController () { diff --git a/Demo/Objective_C_Demo/ViewController/ManualToolbarViewController.m b/Demo/Objective_C_Demo/ViewController/ManualToolbarViewController.m index b61c217e7..e0226f582 100644 --- a/Demo/Objective_C_Demo/ViewController/ManualToolbarViewController.m +++ b/Demo/Objective_C_Demo/ViewController/ManualToolbarViewController.m @@ -7,9 +7,9 @@ // #import "ManualToolbarViewController.h" -#import "IQUIView+IQKeyboardToolbar.h" -#import "IQToolbar.h" -#import "IQTitleBarButtonItem.h" +#import +#import +#import @interface ManualToolbarViewController () diff --git a/Demo/Objective_C_Demo/ViewController/RefreshLayoutViewController.m b/Demo/Objective_C_Demo/ViewController/RefreshLayoutViewController.m index 4f82e8ce1..39ce7fbe5 100644 --- a/Demo/Objective_C_Demo/ViewController/RefreshLayoutViewController.m +++ b/Demo/Objective_C_Demo/ViewController/RefreshLayoutViewController.m @@ -7,7 +7,7 @@ // #import "RefreshLayoutViewController.h" -#import "IQKeyboardManager.h" +#import @interface RefreshLayoutViewController () diff --git a/Demo/Objective_C_Demo/ViewController/Settings/SettingsViewController.m b/Demo/Objective_C_Demo/ViewController/Settings/SettingsViewController.m index 67ee5f568..6827df15c 100644 --- a/Demo/Objective_C_Demo/ViewController/Settings/SettingsViewController.m +++ b/Demo/Objective_C_Demo/ViewController/Settings/SettingsViewController.m @@ -9,7 +9,7 @@ #import "SettingsViewController.h" #import "OptionsViewController.h" -#import "IQKeyboardManager.h" +#import #import "SwitchTableViewCell.h" #import "StepperTableViewCell.h" diff --git a/Demo/Objective_C_Demo/ViewController/SpecialCaseViewController.m b/Demo/Objective_C_Demo/ViewController/SpecialCaseViewController.m index 4341e4821..526d76c8d 100644 --- a/Demo/Objective_C_Demo/ViewController/SpecialCaseViewController.m +++ b/Demo/Objective_C_Demo/ViewController/SpecialCaseViewController.m @@ -3,9 +3,9 @@ // KeyboardTextFieldDemo #import "SpecialCaseViewController.h" -#import "IQUIView+Hierarchy.h" -#import "IQKeyboardManager.h" -#import "IQUIView+IQKeyboardToolbar.h" +#import +#import +#import @interface SpecialCaseViewController () diff --git a/Demo/Objective_C_Demo/ViewController/TextFieldViewController.m b/Demo/Objective_C_Demo/ViewController/TextFieldViewController.m index 8c00776d6..fd233dc6c 100644 --- a/Demo/Objective_C_Demo/ViewController/TextFieldViewController.m +++ b/Demo/Objective_C_Demo/ViewController/TextFieldViewController.m @@ -3,10 +3,8 @@ // KeyboardTextFieldDemo #import "TextFieldViewController.h" -#import "IQKeyboardManager.h" -#import "IQDropDownTextField.h" -#import "IQUIView+IQKeyboardToolbar.h" -#import "IQUITextFieldView+Additions.h" +#import +#import @interface TextFieldViewController () diff --git a/Demo/Objective_C_Demo/ViewController/TextViewSpecialCaseViewController.m b/Demo/Objective_C_Demo/ViewController/TextViewSpecialCaseViewController.m index 695a45fcf..db9ff8a89 100644 --- a/Demo/Objective_C_Demo/ViewController/TextViewSpecialCaseViewController.m +++ b/Demo/Objective_C_Demo/ViewController/TextViewSpecialCaseViewController.m @@ -3,7 +3,7 @@ // KeyboardTextFieldDemo #import "TextViewSpecialCaseViewController.h" -#import "IQKeyboardManager.h" +#import @interface TextViewSpecialCaseViewController () diff --git a/Demo/Objective_C_Demo/ViewController/ViewController.m b/Demo/Objective_C_Demo/ViewController/ViewController.m index 378486ebf..ed030e5bb 100644 --- a/Demo/Objective_C_Demo/ViewController/ViewController.m +++ b/Demo/Objective_C_Demo/ViewController/ViewController.m @@ -3,7 +3,7 @@ // KeyboardTextFieldDemo #import "ViewController.h" -#import "IQKeyboardManager.h" +#import @interface ViewController () diff --git a/Demo/Swift_Demo/ViewController/TextViewController.swift b/Demo/Swift_Demo/ViewController/TextViewController.swift index 217585d1f..9b75ee7e7 100644 --- a/Demo/Swift_Demo/ViewController/TextViewController.swift +++ b/Demo/Swift_Demo/ViewController/TextViewController.swift @@ -6,6 +6,8 @@ // Copyright © 2016 Iftekhar. All rights reserved. // +import UIKit + class TextViewController: UIViewController { } diff --git a/IQKeyboardManager.podspec.json b/IQKeyboardManager.podspec.json index 0cf974636..9dfb39bf2 100644 --- a/IQKeyboardManager.podspec.json +++ b/IQKeyboardManager.podspec.json @@ -1,9 +1,9 @@ { "name": "IQKeyboardManager", - "version": "6.5.11", + "version": "6.5.12", "source": { "git": "https://github.com/hackiftekhar/IQKeyboardManager.git", - "tag": "v6.5.11" + "tag": "6.5.12" }, "summary": "Codeless drop-in universal library allows to prevent issues of keyboard sliding up and cover UITextField/UITextView.", "homepage": "https://github.com/hackiftekhar/IQKeyboardManager", @@ -13,7 +13,7 @@ "Iftekhar Qurashi": "hack.iftekhar@gmail.com" }, "platforms": { - "ios": "9.0" + "ios": "11.0" }, "source_files": "IQKeyboardManager/**/*.{h,m}", "public_header_files": [ diff --git a/IQKeyboardManager/Categories/IQNSArray+Sort.h b/IQKeyboardManager/Categories/IQNSArray+Sort.h index f165d8514..0846d2ab9 100644 --- a/IQKeyboardManager/Categories/IQNSArray+Sort.h +++ b/IQKeyboardManager/Categories/IQNSArray+Sort.h @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import +#import @class UIView; diff --git a/IQKeyboardManager/Categories/IQNSArray+Sort.m b/IQKeyboardManager/Categories/IQNSArray+Sort.m index 7ca0cdd53..bfbb2af1a 100644 --- a/IQKeyboardManager/Categories/IQNSArray+Sort.m +++ b/IQKeyboardManager/Categories/IQNSArray+Sort.m @@ -21,10 +21,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +#import + #import "IQNSArray+Sort.h" #import "IQUIView+Hierarchy.h" -#import @implementation NSArray (IQ_NSArray_Sort) diff --git a/IQKeyboardManager/Categories/IQUIScrollView+Additions.h b/IQKeyboardManager/Categories/IQUIScrollView+Additions.h index 42c7950ea..daec436c8 100644 --- a/IQKeyboardManager/Categories/IQUIScrollView+Additions.h +++ b/IQKeyboardManager/Categories/IQUIScrollView+Additions.h @@ -21,8 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import -#import +#import @interface UIScrollView (Additions) diff --git a/IQKeyboardManager/Categories/IQUIScrollView+Additions.m b/IQKeyboardManager/Categories/IQUIScrollView+Additions.m index 528214b16..9ea6257c9 100644 --- a/IQKeyboardManager/Categories/IQUIScrollView+Additions.m +++ b/IQKeyboardManager/Categories/IQUIScrollView+Additions.m @@ -21,9 +21,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "IQUIScrollView+Additions.h" #import +#import "IQUIScrollView+Additions.h" + @implementation UIScrollView (Additions) -(void)setShouldIgnoreScrollingAdjustment:(BOOL)shouldIgnoreScrollingAdjustment diff --git a/IQKeyboardManager/Categories/IQUITextFieldView+Additions.h b/IQKeyboardManager/Categories/IQUITextFieldView+Additions.h index 59cf29603..331833542 100644 --- a/IQKeyboardManager/Categories/IQUITextFieldView+Additions.h +++ b/IQKeyboardManager/Categories/IQUITextFieldView+Additions.h @@ -21,8 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import -#import +#import + +#import "IQKeyboardManagerConstants.h" /** UIView category for managing UITextField/UITextView diff --git a/IQKeyboardManager/Categories/IQUITextFieldView+Additions.m b/IQKeyboardManager/Categories/IQUITextFieldView+Additions.m index 24fa62b85..0cedc5c76 100644 --- a/IQKeyboardManager/Categories/IQUITextFieldView+Additions.m +++ b/IQKeyboardManager/Categories/IQUITextFieldView+Additions.m @@ -21,9 +21,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "IQUITextFieldView+Additions.h" #import +#import "IQUITextFieldView+Additions.h" + @implementation UIView (Additions) -(void)setKeyboardDistanceFromTextField:(CGFloat)keyboardDistanceFromTextField diff --git a/IQKeyboardManager/Categories/IQUIView+Hierarchy.h b/IQKeyboardManager/Categories/IQUIView+Hierarchy.h index 65c64d989..5f1487899 100644 --- a/IQKeyboardManager/Categories/IQUIView+Hierarchy.h +++ b/IQKeyboardManager/Categories/IQUIView+Hierarchy.h @@ -21,9 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import -#import -#import +#import + +#import "IQKeyboardManagerConstants.h" @class UICollectionView, UIScrollView, UITableView, UISearchBar, NSArray; diff --git a/IQKeyboardManager/Categories/IQUIView+Hierarchy.m b/IQKeyboardManager/Categories/IQUIView+Hierarchy.m index eabb4b3c1..41ade0ba9 100644 --- a/IQKeyboardManager/Categories/IQUIView+Hierarchy.m +++ b/IQKeyboardManager/Categories/IQUIView+Hierarchy.m @@ -21,23 +21,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +#import +#import + #import "IQUIView+Hierarchy.h" #import "IQUITextFieldView+Additions.h" #import "IQUIViewController+Additions.h" - -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import - -#import - #import "IQNSArray+Sort.h" @implementation UIView (IQ_UIView_Hierarchy) diff --git a/IQKeyboardManager/Categories/IQUIViewController+Additions.h b/IQKeyboardManager/Categories/IQUIViewController+Additions.h index 5318b43b9..ed8ce7884 100644 --- a/IQKeyboardManager/Categories/IQUIViewController+Additions.h +++ b/IQKeyboardManager/Categories/IQUIViewController+Additions.h @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import +#import @class NSLayoutConstraint; diff --git a/IQKeyboardManager/Categories/IQUIViewController+Additions.m b/IQKeyboardManager/Categories/IQUIViewController+Additions.m index 8c08fa5bf..1777bbf6e 100644 --- a/IQKeyboardManager/Categories/IQUIViewController+Additions.m +++ b/IQKeyboardManager/Categories/IQUIViewController+Additions.m @@ -21,10 +21,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "IQUIViewController+Additions.h" -#import +#import #import +#import "IQUIViewController+Additions.h" + + @implementation UIViewController (Additions) -(nullable UIViewController*)parentIQContainerViewController diff --git a/IQKeyboardManager/Constants/IQKeyboardManagerConstants.h b/IQKeyboardManager/Constants/IQKeyboardManagerConstants.h index 548f16f60..f2becf40e 100644 --- a/IQKeyboardManager/Constants/IQKeyboardManagerConstants.h +++ b/IQKeyboardManager/Constants/IQKeyboardManagerConstants.h @@ -24,7 +24,7 @@ #ifndef IQKeyboardManagerConstants_h #define IQKeyboardManagerConstants_h -#import +#import ///----------------------------------- /// @name IQAutoToolbarManageBehaviour diff --git a/IQKeyboardManager/IQKeyboardManager.h b/IQKeyboardManager/IQKeyboardManager.h index e6f950336..d2ea83f37 100755 --- a/IQKeyboardManager/IQKeyboardManager.h +++ b/IQKeyboardManager/IQKeyboardManager.h @@ -21,26 +21,22 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import - -#import - -#import -#import -#import - -#import +#import +#import +#import + +#import "IQKeyboardManagerConstants.h" +#import "IQUIView+IQKeyboardToolbar.h" +#import "IQPreviousNextView.h" +#import "IQUIViewController+Additions.h" +#import "IQKeyboardReturnKeyHandler.h" +#import "IQTextView.h" +#import "IQToolbar.h" +#import "IQUIScrollView+Additions.h" +#import "IQUITextFieldView+Additions.h" +#import "IQBarButtonItem.h" +#import "IQTitleBarButtonItem.h" +#import "IQUIView+Hierarchy.h" @class UIFont, UIColor, UITapGestureRecognizer, UIView, UIImage; diff --git a/IQKeyboardManager/IQKeyboardManager.m b/IQKeyboardManager/IQKeyboardManager.m index fa1152ed7..3e9601c34 100644 --- a/IQKeyboardManager/IQKeyboardManager.m +++ b/IQKeyboardManager/IQKeyboardManager.m @@ -21,6 +21,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +#import +#import +#import + #import "IQKeyboardManager.h" #import "IQUIView+Hierarchy.h" #import "IQUIView+IQKeyboardToolbar.h" @@ -31,33 +35,6 @@ #import "IQUIViewController+Additions.h" #import "IQPreviousNextView.h" -#import - -#import - -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 -#import -#import -#endif - NSInteger const kIQDoneButtonToolbarTag = -1002; NSInteger const kIQPreviousNextButtonToolbarTag = -1005; diff --git a/IQKeyboardManager/IQKeyboardReturnKeyHandler.h b/IQKeyboardManager/IQKeyboardReturnKeyHandler.h index 1e26f34bf..3799fc857 100644 --- a/IQKeyboardManager/IQKeyboardReturnKeyHandler.h +++ b/IQKeyboardManager/IQKeyboardReturnKeyHandler.h @@ -21,12 +21,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import +#import +#import -#import -#import - -#import +#import "IQKeyboardManagerConstants.h" @class UITextField, UIView, UIViewController; @protocol UITextFieldDelegate, UITextViewDelegate; diff --git a/IQKeyboardManager/IQKeyboardReturnKeyHandler.m b/IQKeyboardManager/IQKeyboardReturnKeyHandler.m index c927b6dbe..ffca638a0 100644 --- a/IQKeyboardManager/IQKeyboardReturnKeyHandler.m +++ b/IQKeyboardManager/IQKeyboardReturnKeyHandler.m @@ -21,15 +21,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +#import + #import "IQKeyboardReturnKeyHandler.h" #import "IQKeyboardManager.h" #import "IQUIView+Hierarchy.h" #import "IQNSArray+Sort.h" -#import -#import -#import - @interface IQTextFieldViewInfoModal : NSObject @property(nullable, nonatomic, weak) UIView *textFieldView; diff --git a/IQKeyboardManager/IQTextView/IQTextView.h b/IQKeyboardManager/IQTextView/IQTextView.h index 214c7a91d..7247864f1 100644 --- a/IQKeyboardManager/IQTextView/IQTextView.h +++ b/IQKeyboardManager/IQTextView/IQTextView.h @@ -21,9 +21,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import +#import + +#import "IQKeyboardManagerConstants.h" -#import /** UITextView with placeholder support diff --git a/IQKeyboardManager/IQTextView/IQTextView.m b/IQKeyboardManager/IQTextView/IQTextView.m index 931d73583..fe5de0ca1 100644 --- a/IQKeyboardManager/IQTextView/IQTextView.m +++ b/IQKeyboardManager/IQTextView/IQTextView.m @@ -21,12 +21,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +#import + #import "IQTextView.h" -#import -#import -#import -#import @interface IQTextView () diff --git a/IQKeyboardManager/IQToolbar/IQBarButtonItem.h b/IQKeyboardManager/IQToolbar/IQBarButtonItem.h index 25bf9ad77..3dd595e77 100644 --- a/IQKeyboardManager/IQToolbar/IQBarButtonItem.h +++ b/IQKeyboardManager/IQToolbar/IQBarButtonItem.h @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import +#import @class NSInvocation; diff --git a/IQKeyboardManager/IQToolbar/IQBarButtonItem.m b/IQKeyboardManager/IQToolbar/IQBarButtonItem.m index 2360ee15f..2348f373d 100644 --- a/IQKeyboardManager/IQToolbar/IQBarButtonItem.m +++ b/IQKeyboardManager/IQToolbar/IQBarButtonItem.m @@ -21,9 +21,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +#import + #import "IQBarButtonItem.h" #import "IQKeyboardManagerConstantsInternal.h" -#import + @implementation IQBarButtonItem diff --git a/IQKeyboardManager/IQToolbar/IQPreviousNextView.h b/IQKeyboardManager/IQToolbar/IQPreviousNextView.h index aa282ee15..bf200c5df 100644 --- a/IQKeyboardManager/IQToolbar/IQPreviousNextView.h +++ b/IQKeyboardManager/IQToolbar/IQPreviousNextView.h @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import +#import /** If you need to enable previous/next toolbar button with some complex hierarchy where your textFields are not in same view, then make the top view as IQPreviousNextView. */ diff --git a/IQKeyboardManager/IQToolbar/IQTitleBarButtonItem.h b/IQKeyboardManager/IQToolbar/IQTitleBarButtonItem.h index 12884ff3d..230a3b3fe 100644 --- a/IQKeyboardManager/IQToolbar/IQTitleBarButtonItem.h +++ b/IQKeyboardManager/IQToolbar/IQTitleBarButtonItem.h @@ -21,10 +21,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import -#import +#import + +#import "IQKeyboardManagerConstants.h" +#import "IQBarButtonItem.h" -#import /** BarButtonItem with title text. diff --git a/IQKeyboardManager/IQToolbar/IQTitleBarButtonItem.m b/IQKeyboardManager/IQToolbar/IQTitleBarButtonItem.m index efd6bdcd4..ce1d2a3aa 100644 --- a/IQKeyboardManager/IQToolbar/IQTitleBarButtonItem.m +++ b/IQKeyboardManager/IQToolbar/IQTitleBarButtonItem.m @@ -21,12 +21,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +#import + #import "IQTitleBarButtonItem.h" #import "IQKeyboardManagerConstants.h" #import "IQKeyboardManagerConstantsInternal.h" -#import -#import @interface IQTitleBarButtonItem () diff --git a/IQKeyboardManager/IQToolbar/IQToolbar.h b/IQKeyboardManager/IQToolbar/IQToolbar.h index e5ec11242..0b80ac0f6 100644 --- a/IQKeyboardManager/IQToolbar/IQToolbar.h +++ b/IQKeyboardManager/IQToolbar/IQToolbar.h @@ -21,10 +21,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import +#import + +#import "IQTitleBarButtonItem.h" -#import -#import /** IQToolbar for IQKeyboardManager. diff --git a/IQKeyboardManager/IQToolbar/IQToolbar.m b/IQKeyboardManager/IQToolbar/IQToolbar.m index 0dc99699f..9afbe9fc7 100644 --- a/IQKeyboardManager/IQToolbar/IQToolbar.m +++ b/IQKeyboardManager/IQToolbar/IQToolbar.m @@ -21,13 +21,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +#import + #import "IQToolbar.h" #import "IQKeyboardManagerConstantsInternal.h" #import "IQUIView+Hierarchy.h" -#import -#import -#import @implementation IQToolbar @synthesize previousBarButton = _previousBarButton; diff --git a/IQKeyboardManager/IQToolbar/IQUIView+IQKeyboardToolbar.h b/IQKeyboardManager/IQToolbar/IQUIView+IQKeyboardToolbar.h index 3e5f4365f..01327eb9c 100644 --- a/IQKeyboardManager/IQToolbar/IQUIView+IQKeyboardToolbar.h +++ b/IQKeyboardManager/IQToolbar/IQUIView+IQKeyboardToolbar.h @@ -21,10 +21,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import +#import + +#import "IQToolbar.h" -#import -#import @interface IQBarButtonItemConfiguration : NSObject diff --git a/IQKeyboardManager/IQToolbar/IQUIView+IQKeyboardToolbar.m b/IQKeyboardManager/IQToolbar/IQUIView+IQKeyboardToolbar.m index b35d8bd16..adb372068 100644 --- a/IQKeyboardManager/IQToolbar/IQUIView+IQKeyboardToolbar.m +++ b/IQKeyboardManager/IQToolbar/IQUIView+IQKeyboardToolbar.m @@ -22,18 +22,14 @@ // THE SOFTWARE. +#import +#import +#import + #import "IQUIView+IQKeyboardToolbar.h" #import "IQKeyboardManagerConstantsInternal.h" #import "IQKeyboardManager.h" -#import - -#import - -#import -#import -#import -#import @implementation IQBarButtonItemConfiguration diff --git a/IQKeyboardManagerSwift.podspec.json b/IQKeyboardManagerSwift.podspec.json index 08be1f072..c15d1304b 100644 --- a/IQKeyboardManagerSwift.podspec.json +++ b/IQKeyboardManagerSwift.podspec.json @@ -1,9 +1,9 @@ { "name": "IQKeyboardManagerSwift", - "version": "6.5.11", + "version": "6.5.12", "source": { "git": "https://github.com/hackiftekhar/IQKeyboardManager.git", - "tag": "v6.5.11" + "tag": "6.5.12" }, "summary": "Codeless drop-in universal library allows to prevent issues of keyboard sliding up and cover UITextField/UITextView.", "homepage": "https://github.com/hackiftekhar/IQKeyboardManager", @@ -13,7 +13,7 @@ "Iftekhar Qurashi": "hack.iftekhar@gmail.com" }, "platforms": { - "ios": "9.0" + "ios": "11.0" }, "swift_versions": [ "4.2", @@ -23,7 +23,9 @@ "5.3", "5.4", "5.5", - "5.6" + "5.6", + "5.7", + "5.8" ], "source_files": "IQKeyboardManagerSwift/**/*.{swift}", "frameworks": [ diff --git a/Package.swift b/Package.swift index 4abaef1ae..7d25988fe 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.6 +// swift-tools-version:5.0 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription diff --git a/Podfile b/Podfile index bd95f09af..f8036d8bf 100644 --- a/Podfile +++ b/Podfile @@ -1,6 +1,6 @@ project 'Demo.xcodeproj' -platform :ios, '8.0' +platform :ios, '11.0' use_frameworks! target 'DemoObjC' do @@ -13,7 +13,7 @@ end target 'DemoSwift' do pod 'SwiftLint' - pod "IQDropDownTextField" + pod "IQDropDownTextFieldSwift" pod "IQKeyboardManagerSwift", :path => "." end diff --git a/Podfile.lock b/Podfile.lock index 09dcb10c7..0459be663 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,11 +1,13 @@ PODS: - - IQDropDownTextField (1.1.1) - - IQKeyboardManager (6.5.8) - - IQKeyboardManagerSwift (6.5.8) - - SwiftLint (0.40.0) + - IQDropDownTextField (4.0.1) + - IQDropDownTextFieldSwift (4.0.0) + - IQKeyboardManager (6.5.12) + - IQKeyboardManagerSwift (6.5.12) + - SwiftLint (0.52.2) DEPENDENCIES: - IQDropDownTextField + - IQDropDownTextFieldSwift - IQKeyboardManager (from `.`) - IQKeyboardManagerSwift (from `.`) - SwiftLint @@ -13,6 +15,7 @@ DEPENDENCIES: SPEC REPOS: trunk: - IQDropDownTextField + - IQDropDownTextFieldSwift - SwiftLint EXTERNAL SOURCES: @@ -22,11 +25,12 @@ EXTERNAL SOURCES: :path: "." SPEC CHECKSUMS: - IQDropDownTextField: 3d2e5728a2b83ff5dbb14cb9b497a80005124cbe - IQKeyboardManager: 1943526a2fa1a6ea24f90c845c274b0e80dd1912 - IQKeyboardManagerSwift: 8139150a3c90a915a413d72a8a3e8634c2d3278b - SwiftLint: 4154893c73a4c52d6240195507eb7a3e3c64087e + IQDropDownTextField: c3a149deb3c6c4bba5edd85d88b6e83e90e08f63 + IQDropDownTextFieldSwift: da07082650f59e04d88470ed0c28899ba3b50692 + IQKeyboardManager: b1fd66ccf7a79095bdcc4a2735231586f744216e + IQKeyboardManagerSwift: 371b08cb39664fb56030f5345c815a4ffc74bbc0 + SwiftLint: 1ac76dac888ca05cb0cf24d0c85887ec1209961d -PODFILE CHECKSUM: dbd75d6b8b35d0cdee14571c29ff90fc1ce4a9ed +PODFILE CHECKSUM: 2967c4a229076bdd1c8dc911a8859a7fd6701a1a -COCOAPODS: 1.11.2 +COCOAPODS: 1.12.1