From e5823026d05381618b9b4d0523300f30a568145e Mon Sep 17 00:00:00 2001 From: Imran Khan Date: Tue, 3 Apr 2018 16:08:47 +0500 Subject: [PATCH] Swift version 4 migration complete --- Example/EPSignature.xcodeproj/project.pbxproj | 24 ++++++++++------- .../AppIcon.appiconset/Contents.json | 17 +++++++++++- Example/Pods/Pods.xcodeproj/project.pbxproj | 26 ++++++++++++------- Pod/Classes/EPSignatureView.swift | 2 +- Pod/Classes/EPSignatureViewController.swift | 8 +++--- 5 files changed, 53 insertions(+), 24 deletions(-) diff --git a/Example/EPSignature.xcodeproj/project.pbxproj b/Example/EPSignature.xcodeproj/project.pbxproj index 7cbed86..15e225c 100644 --- a/Example/EPSignature.xcodeproj/project.pbxproj +++ b/Example/EPSignature.xcodeproj/project.pbxproj @@ -209,13 +209,13 @@ TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - DevelopmentTeam = DG779MAMM2; - LastSwiftMigration = 0800; + DevelopmentTeam = 8GZ7C3J237; + LastSwiftMigration = 0920; }; 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; DevelopmentTeam = DG779MAMM2; - LastSwiftMigration = 0800; + LastSwiftMigration = 0920; TestTargetID = 607FACCF1AFB9204008FA782; }; }; @@ -444,6 +444,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; }; name = Debug; }; @@ -483,6 +484,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; VALIDATE_PRODUCT = YES; }; name = Release; @@ -493,13 +495,14 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = DG779MAMM2; + DEVELOPMENT_TEAM = 8GZ7C3J237; INFOPLIST_FILE = EPSignature/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -510,13 +513,14 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = DG779MAMM2; + DEVELOPMENT_TEAM = 8GZ7C3J237; INFOPLIST_FILE = EPSignature/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -537,7 +541,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EPSignature_Example.app/EPSignature_Example"; }; name = Debug; @@ -554,7 +559,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EPSignature_Example.app/EPSignature_Example"; }; name = Release; diff --git a/Example/EPSignature/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/EPSignature/Images.xcassets/AppIcon.appiconset/Contents.json index d3942e9..19882d5 100644 --- a/Example/EPSignature/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Example/EPSignature/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "29x29", @@ -29,10 +39,15 @@ "idiom" : "iphone", "size" : "60x60", "scale" : "3x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { "version" : 1, "author" : "xcode" } -} +} \ No newline at end of file diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 0177e54..cc5585d 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -357,13 +357,13 @@ LastUpgradeCheck = 0800; TargetAttributes = { 07105C938947535D110091D503F33E9D = { - LastSwiftMigration = 0800; + LastSwiftMigration = 0920; }; 3D2A3D40827417AB70908A8BC030D717 = { - LastSwiftMigration = 0800; + LastSwiftMigration = 0920; }; E4B849E452EF0491E8820A1949401938 = { - LastSwiftMigration = 0800; + LastSwiftMigration = 0920; }; }; }; @@ -470,7 +470,8 @@ PRODUCT_NAME = Pods_EPSignature_Example; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -511,6 +512,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; STRIP_INSTALLED_PRODUCT = NO; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SYMROOT = "${SRCROOT}/../build"; VALIDATE_PRODUCT = YES; }; @@ -538,7 +540,8 @@ PRODUCT_NAME = EPSignature; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -585,6 +588,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; ONLY_ACTIVE_ARCH = YES; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SYMROOT = "${SRCROOT}/../build"; }; name = Debug; @@ -612,7 +616,8 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -645,7 +650,8 @@ PRODUCT_NAME = Pods_EPSignature_Tests; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -679,7 +685,8 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -713,7 +720,8 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; diff --git a/Pod/Classes/EPSignatureView.swift b/Pod/Classes/EPSignatureView.swift index 9df229d..05e6aaa 100644 --- a/Pod/Classes/EPSignatureView.swift +++ b/Pod/Classes/EPSignatureView.swift @@ -59,7 +59,7 @@ open class EPSignatureView: UIView { self.addGestureRecognizer(longPressGesture) } - func longPressed(_ gesture: UILongPressGestureRecognizer) { + @objc func longPressed(_ gesture: UILongPressGestureRecognizer) { let touchPoint = gesture.location(in: self) let endAngle = CGFloat(2.0 * M_PI) bezierPath.move(to: touchPoint) diff --git a/Pod/Classes/EPSignatureViewController.swift b/Pod/Classes/EPSignatureViewController.swift index 71e8aaa..e76a97c 100644 --- a/Pod/Classes/EPSignatureViewController.swift +++ b/Pod/Classes/EPSignatureViewController.swift @@ -100,12 +100,12 @@ open class EPSignatureViewController: UIViewController { // MARK: - Button Actions - func onTouchCancelButton() { + @objc func onTouchCancelButton() { signatureDelegate?.epSignature!(self, didCancel: NSError(domain: "EPSignatureDomain", code: 1, userInfo: [NSLocalizedDescriptionKey:"User not signed"])) dismiss(animated: true, completion: nil) } - func onTouchDoneButton() { + @objc func onTouchDoneButton() { if let signature = signatureView.getSignatureAsImage() { if switchSaveSignature.isOn { let docPath = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first @@ -119,7 +119,7 @@ open class EPSignatureViewController: UIViewController { } } - func onTouchActionButton(_ barButton: UIBarButtonItem) { + @objc func onTouchActionButton(_ barButton: UIBarButtonItem) { let action = UIAlertController(title: "Action", message: "", preferredStyle: UIAlertControllerStyle.actionSheet) action.view.tintColor = tintColor @@ -141,7 +141,7 @@ open class EPSignatureViewController: UIViewController { present(action, animated: true, completion: nil) } - func onTouchClearButton() { + @objc func onTouchClearButton() { signatureView.clear() }