From dca2bcbe6bcf1afbb3482bdb32a1ac48dec5b3ea Mon Sep 17 00:00:00 2001 From: Quentin Arnault Date: Sun, 11 Nov 2018 09:45:40 +0100 Subject: [PATCH] =?UTF-8?q?[I]=C2=A0add=20swift=204.1=20support?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Example/Pods/Pods.xcodeproj/project.pbxproj | 52 +++++++++++++++++-- .../xcschemes/SnapSliderFilters.xcscheme | 39 +++++++++----- .../Pods-SnapSliderFilters_Example/Info.plist | 40 +++++++------- .../Pods-SnapSliderFilters_Tests/Info.plist | 40 +++++++------- .../SnapSliderFilters/Info.plist | 6 +-- .../project.pbxproj | 13 +++-- .../SnapSliderFilters-Example.xcscheme | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++ .../SnapSliderFilters/ViewController.swift | 2 +- SnapSliderFilters/Classes/SNButton.swift | 6 +-- SnapSliderFilters/Classes/SNTextField.swift | 4 +- 11 files changed, 141 insertions(+), 71 deletions(-) create mode 100644 Example/SnapSliderFilters.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index cf8fa95..e6e2155 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -340,7 +340,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0940; TargetAttributes = { 1F3FDF782886F3896275161381892DE5 = { LastSwiftMigration = 0800; @@ -349,7 +349,7 @@ LastSwiftMigration = 0800; }; 7CC7E80C1B27CC4BA08C07AB237964B6 = { - LastSwiftMigration = 0800; + LastSwiftMigration = 0940; }; }; }; @@ -431,18 +431,30 @@ 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; 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; + 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; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -452,6 +464,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.3; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_COMPILATION_MODE = wholemodule; SYMROOT = "${SRCROOT}/../build"; VALIDATE_PRODUCT = YES; }; @@ -461,7 +474,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 544C6CB47B48E9598CE2B936A5A45926 /* Pods-SnapSliderFilters_Example.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -479,6 +494,7 @@ OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = Pods_SnapSliderFilters_Example; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -493,6 +509,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 47BD28D3C18896525208F13CDD7E43F1 /* SnapSliderFilters.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -507,11 +524,13 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/SnapSliderFilters/SnapSliderFilters.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = SnapSliderFilters; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -526,18 +545,31 @@ 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; 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; + 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; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -561,7 +593,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 46B77637576DD533CC836A1C8D9B6222 /* Pods-SnapSliderFilters_Example.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -579,6 +613,7 @@ OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = Pods_SnapSliderFilters_Example; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -594,6 +629,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 0E4DB8475C8819432A1C815283E4E52F /* Pods-SnapSliderFilters_Tests.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -611,6 +648,7 @@ OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = Pods_SnapSliderFilters_Tests; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -626,6 +664,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 47BD28D3C18896525208F13CDD7E43F1 /* SnapSliderFilters.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -640,10 +679,12 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/SnapSliderFilters/SnapSliderFilters.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = SnapSliderFilters; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -654,6 +695,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 3608A6482718ED15276C590A18AF5517 /* Pods-SnapSliderFilters_Tests.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -671,6 +714,7 @@ OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = Pods_SnapSliderFilters_Tests; SDKROOT = iphoneos; SKIP_INSTALL = YES; diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapSliderFilters.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapSliderFilters.xcscheme index d2e729e..3c81ef8 100644 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapSliderFilters.xcscheme +++ b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapSliderFilters.xcscheme @@ -1,36 +1,39 @@ + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + BuildableIdentifier = "primary" + BlueprintIdentifier = "7CC7E80C1B27CC4BA08C07AB237964B6" + BuildableName = "SnapSliderFilters.framework" + BlueprintName = "SnapSliderFilters" + ReferencedContainer = "container:Pods.xcodeproj"> + shouldUseLaunchSchemeArgsEnv = "YES"> + + + + + + + debugDocumentVersioning = "YES"> diff --git a/Example/Pods/Target Support Files/Pods-SnapSliderFilters_Example/Info.plist b/Example/Pods/Target Support Files/Pods-SnapSliderFilters_Example/Info.plist index 6974542..11db4b7 100644 --- a/Example/Pods/Target Support Files/Pods-SnapSliderFilters_Example/Info.plist +++ b/Example/Pods/Target Support Files/Pods-SnapSliderFilters_Example/Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - org.cocoapods.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/Example/Pods/Target Support Files/Pods-SnapSliderFilters_Tests/Info.plist b/Example/Pods/Target Support Files/Pods-SnapSliderFilters_Tests/Info.plist index 6974542..11db4b7 100644 --- a/Example/Pods/Target Support Files/Pods-SnapSliderFilters_Tests/Info.plist +++ b/Example/Pods/Target Support Files/Pods-SnapSliderFilters_Tests/Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - org.cocoapods.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/Example/Pods/Target Support Files/SnapSliderFilters/Info.plist b/Example/Pods/Target Support Files/SnapSliderFilters/Info.plist index f01fe2e..a846041 100644 --- a/Example/Pods/Target Support Files/SnapSliderFilters/Info.plist +++ b/Example/Pods/Target Support Files/SnapSliderFilters/Info.plist @@ -2,14 +2,12 @@ - NSPhotoLibraryUsageDescription - Load your own photos and give it a try ! CFBundleDevelopmentRegion en CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - org.cocoapods.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -22,6 +20,8 @@ ???? CFBundleVersion ${CURRENT_PROJECT_VERSION} + NSPhotoLibraryUsageDescription + Load your own photos and give it a try ! NSPrincipalClass diff --git a/Example/SnapSliderFilters.xcodeproj/project.pbxproj b/Example/SnapSliderFilters.xcodeproj/project.pbxproj index 8718af7..98db764 100644 --- a/Example/SnapSliderFilters.xcodeproj/project.pbxproj +++ b/Example/SnapSliderFilters.xcodeproj/project.pbxproj @@ -170,8 +170,9 @@ TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - DevelopmentTeam = VH6T8695X3; + DevelopmentTeam = LLV33K3333; LastSwiftMigration = 0800; + ProvisioningStyle = Automatic; }; }; }; @@ -381,6 +382,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = LLV33K3333; INFOPLIST_FILE = SnapSliderFilters/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -388,7 +391,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - SWIFT_VERSION = 3.0; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -399,6 +403,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = LLV33K3333; INFOPLIST_FILE = SnapSliderFilters/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -406,7 +412,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - SWIFT_VERSION = 3.0; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/Example/SnapSliderFilters.xcodeproj/xcshareddata/xcschemes/SnapSliderFilters-Example.xcscheme b/Example/SnapSliderFilters.xcodeproj/xcshareddata/xcschemes/SnapSliderFilters-Example.xcscheme index ba21cf8..b977032 100644 --- a/Example/SnapSliderFilters.xcodeproj/xcshareddata/xcschemes/SnapSliderFilters-Example.xcscheme +++ b/Example/SnapSliderFilters.xcodeproj/xcshareddata/xcschemes/SnapSliderFilters-Example.xcscheme @@ -1,6 +1,6 @@ + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/SnapSliderFilters/ViewController.swift b/Example/SnapSliderFilters/ViewController.swift index 15c0bbc..34f4343 100644 --- a/Example/SnapSliderFilters/ViewController.swift +++ b/Example/SnapSliderFilters/ViewController.swift @@ -137,7 +137,7 @@ extension ViewController: SNSliderDataSource { extension ViewController: UIGestureRecognizerDelegate { - func handleTap() { + @objc func handleTap() { self.textField.handleTap() } } diff --git a/SnapSliderFilters/Classes/SNButton.swift b/SnapSliderFilters/Classes/SNButton.swift index 1b75f68..8edef18 100644 --- a/SnapSliderFilters/Classes/SNButton.swift +++ b/SnapSliderFilters/Classes/SNButton.swift @@ -114,16 +114,16 @@ open class SNButton: UIButton { self.action = actionClosure } - func buttonTouchUpInside() { + @objc func buttonTouchUpInside() { shouldRunAction=true buttonReleased() } - func buttonPressed() { + @objc func buttonPressed() { buttonState = .bigButton } - func buttonReleased() { + @objc func buttonReleased() { buttonState = .smallButton } } diff --git a/SnapSliderFilters/Classes/SNTextField.swift b/SnapSliderFilters/Classes/SNTextField.swift index 7a501e4..2864532 100644 --- a/SnapSliderFilters/Classes/SNTextField.swift +++ b/SnapSliderFilters/Classes/SNTextField.swift @@ -88,7 +88,7 @@ extension SNTextField: UITextFieldDelegate { // Limit the text size to the screen width public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { let text:NSString = (self.text! as NSString).replacingCharacters(in: range, with: string) as NSString - let contentWidth = text.size(attributes: [NSFontAttributeName: UIFont.systemFont(ofSize: 16.0)]).width + let contentWidth = text.size(withAttributes: [NSAttributedStringKey.font: UIFont.systemFont(ofSize: 16.0)]).width return contentWidth <= (self.frame.width - 20) } @@ -113,7 +113,7 @@ extension SNTextField: UIGestureRecognizerDelegate { } } - func handlePan(_ recognizer:UIPanGestureRecognizer) { + @objc func handlePan(_ recognizer:UIPanGestureRecognizer) { if self.isFirstResponder == true { return }