From 827245ca9ea751b3094caa6c063bf9ce377ad25f Mon Sep 17 00:00:00 2001 From: Lorenzo Greco Date: Wed, 11 Oct 2017 14:35:13 -0400 Subject: [PATCH 1/2] Swift 4 migration --- Example/LGButton.xcodeproj/project.pbxproj | 8 ++-- .../UserInterfaceState.xcuserstate | Bin 36041 -> 0 bytes Example/Pods/Pods.xcodeproj/project.pbxproj | 40 +++++++++--------- .../Classes/SwiftIconFont/FontLoader.swift | 2 +- .../Classes/SwiftIconFont/SwiftIconFont.swift | 4 +- 5 files changed, 29 insertions(+), 25 deletions(-) delete mode 100644 Example/LGButton.xcworkspace/xcuserdata/Renzo.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/Example/LGButton.xcodeproj/project.pbxproj b/Example/LGButton.xcodeproj/project.pbxproj index e1b1820..180ee94 100644 --- a/Example/LGButton.xcodeproj/project.pbxproj +++ b/Example/LGButton.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0820; + LastSwiftMigration = 0900; }; }; }; @@ -359,7 +359,8 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -374,7 +375,8 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/Example/LGButton.xcworkspace/xcuserdata/Renzo.xcuserdatad/UserInterfaceState.xcuserstate b/Example/LGButton.xcworkspace/xcuserdata/Renzo.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 44c9091d6a0ddb70beb36fd6026ece017b993d4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36041 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 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 64343d7..5ab9e11 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -46,42 +46,42 @@ /* Begin PBXFileReference section */ 0B20ACF853EB8F283E58423F463C7216 /* Iconic.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Iconic.swift; sourceTree = ""; }; - 121146EFC3ADA2D6DDB75E7F492ED7EF /* LGButton.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = LGButton.framework; path = LGButton.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 121146EFC3ADA2D6DDB75E7F492ED7EF /* LGButton.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LGButton.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1E9B71A109D508B275BCC6E9951EEADB /* FontAwesome.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FontAwesome.swift; sourceTree = ""; }; - 20464789E35A3C5C08FFD2F7F1D4151A /* LGButton.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = LGButton.modulemap; sourceTree = ""; }; - 2C78C124D8B77BD81D0F5990AF82BB70 /* octicons.ttf */ = {isa = PBXFileReference; includeInIndex = 1; path = octicons.ttf; sourceTree = ""; }; + 20464789E35A3C5C08FFD2F7F1D4151A /* LGButton.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = LGButton.modulemap; sourceTree = ""; }; + 2C78C124D8B77BD81D0F5990AF82BB70 /* octicons.ttf */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file; path = octicons.ttf; sourceTree = ""; }; 51DF4FCB3A26EFA840F900B24630850B /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 53CB2A24D8163BA015118CF955ACCD1D /* themify.ttf */ = {isa = PBXFileReference; includeInIndex = 1; path = themify.ttf; sourceTree = ""; }; - 58109B1421C9A7A37D20C75DA9B8CC32 /* Pods_LGButton_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_LGButton_Example.framework; path = "Pods-LGButton_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 53CB2A24D8163BA015118CF955ACCD1D /* themify.ttf */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file; path = themify.ttf; sourceTree = ""; }; + 58109B1421C9A7A37D20C75DA9B8CC32 /* Pods_LGButton_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LGButton_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 59B5D472E9025E1F0B6CA7D43899F55E /* Pods-LGButton_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-LGButton_Example.debug.xcconfig"; sourceTree = ""; }; - 5C9A0D9B68CCB420CD29A794A47B0AE8 /* Ionicons.ttf */ = {isa = PBXFileReference; includeInIndex = 1; path = Ionicons.ttf; sourceTree = ""; }; + 5C9A0D9B68CCB420CD29A794A47B0AE8 /* Ionicons.ttf */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file; path = Ionicons.ttf; sourceTree = ""; }; 6551313FA8903C5FA465CBFC05E5FEC0 /* LGButton-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "LGButton-dummy.m"; sourceTree = ""; }; 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; 72000624B028A35E191DF3FFEDA8B108 /* IonIcons.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = IonIcons.swift; sourceTree = ""; }; 727F9C1EF1E72B342170252BC762AB3F /* LGButton.xib */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file.xib; path = LGButton.xib; sourceTree = ""; }; 7744F556506528A690A2C7F2E97AC852 /* Pods-LGButton_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-LGButton_Example-acknowledgements.plist"; sourceTree = ""; }; 83E73F4DBC9A99C77225387438AA36DD /* MaterialIcon.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MaterialIcon.swift; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9473015A3175631C2E52D2D1F9DE57A8 /* Pods-LGButton_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-LGButton_Example-acknowledgements.markdown"; sourceTree = ""; }; 949D317014EA6BAD6FF072FAC9C796AA /* LGButton.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = LGButton.xcconfig; sourceTree = ""; }; 9DA2BD7993F705FF9CA0EBB1134918BB /* ThemifyIcon.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ThemifyIcon.swift; sourceTree = ""; }; 9E9D86947C22FF54DA2D571C3FFAC5E1 /* SwiftIconLabel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SwiftIconLabel.swift; sourceTree = ""; }; AC9146F85173595F1FA76C017F87EAA0 /* SwiftIconFont.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SwiftIconFont.swift; sourceTree = ""; }; - B6C00BD084DCC3737E2023F26CE65D58 /* map-icons.ttf */ = {isa = PBXFileReference; includeInIndex = 1; path = "map-icons.ttf"; sourceTree = ""; }; + B6C00BD084DCC3737E2023F26CE65D58 /* map-icons.ttf */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file; path = "map-icons.ttf"; sourceTree = ""; }; B6EE69601059A63836703F2A74296002 /* FontLoader.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FontLoader.swift; sourceTree = ""; }; - BBDB9AE7AAE5BCDC6B1A26D5E623B23D /* FontAwesome.ttf */ = {isa = PBXFileReference; includeInIndex = 1; path = FontAwesome.ttf; sourceTree = ""; }; + BBDB9AE7AAE5BCDC6B1A26D5E623B23D /* FontAwesome.ttf */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file; path = FontAwesome.ttf; sourceTree = ""; }; C06A7CB11BE2A77C3269CDB24B28CD06 /* LGButton.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LGButton.swift; sourceTree = ""; }; C06B66404DEACFB865299CF0031CA27D /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C9101A1F98585EC05E953D8B8DBD6A5F /* open-iconic.ttf */ = {isa = PBXFileReference; includeInIndex = 1; path = "open-iconic.ttf"; sourceTree = ""; }; + C9101A1F98585EC05E953D8B8DBD6A5F /* open-iconic.ttf */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file; path = "open-iconic.ttf"; sourceTree = ""; }; CC17526743A06FF79354C31AE6D133B4 /* MapIcon.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapIcon.swift; sourceTree = ""; }; CCE5742C4865D28386BBC6726126293F /* Pods-LGButton_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-LGButton_Example-dummy.m"; sourceTree = ""; }; D16729AF393252BDF8C879F04B8A8B98 /* Pods-LGButton_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-LGButton_Example-frameworks.sh"; sourceTree = ""; }; - D4831F8C43F3B0FD017A7542AF927D47 /* MaterialIcons-Regular.ttf */ = {isa = PBXFileReference; includeInIndex = 1; path = "MaterialIcons-Regular.ttf"; sourceTree = ""; }; + D4831F8C43F3B0FD017A7542AF927D47 /* MaterialIcons-Regular.ttf */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file; path = "MaterialIcons-Regular.ttf"; sourceTree = ""; }; DEB9CB8AF1B9D0F8FD596B8CDC849F74 /* Pods-LGButton_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-LGButton_Example-umbrella.h"; sourceTree = ""; }; E338AF219D9DAEB4F16039D2D71BDE3E /* Pods-LGButton_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-LGButton_Example.release.xcconfig"; sourceTree = ""; }; EA3E8A4809A32F492529D2650162BF3A /* LGButton-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LGButton-prefix.pch"; sourceTree = ""; }; F5F3AD87D5239627A965C5CBBF7CE2EC /* LGButton-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LGButton-umbrella.h"; sourceTree = ""; }; - FAA670EBA3B1E072C9F7C24657F56B4F /* Pods-LGButton_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-LGButton_Example.modulemap"; sourceTree = ""; }; + FAA670EBA3B1E072C9F7C24657F56B4F /* Pods-LGButton_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-LGButton_Example.modulemap"; sourceTree = ""; }; FE2F7910433F9690EBB9434F61D42F39 /* Octicon.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Octicon.swift; sourceTree = ""; }; FEBC577135FB70C8951F764C5BBED649 /* Pods-LGButton_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-LGButton_Example-resources.sh"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -171,7 +171,6 @@ C9101A1F98585EC05E953D8B8DBD6A5F /* open-iconic.ttf */, 53CB2A24D8163BA015118CF955ACCD1D /* themify.ttf */, ); - name = Resources; path = Resources; sourceTree = ""; }; @@ -180,7 +179,6 @@ children = ( 44F8C7FF9552963A791362FD579324A0 /* Resources */, ); - name = LGButton; path = LGButton; sourceTree = ""; }; @@ -200,7 +198,6 @@ children = ( D1204BAA4E93A8062AC3B4A420A80E25 /* Classes */, ); - name = LGButton; path = LGButton; sourceTree = ""; }; @@ -218,7 +215,6 @@ C06A7CB11BE2A77C3269CDB24B28CD06 /* LGButton.swift */, FECD72F8CBF578E85B48DDAC70A33C74 /* SwiftIconFont */, ); - name = Classes; path = Classes; sourceTree = ""; }; @@ -267,7 +263,6 @@ 9E9D86947C22FF54DA2D571C3FFAC5E1 /* SwiftIconLabel.swift */, 9DA2BD7993F705FF9CA0EBB1134918BB /* ThemifyIcon.swift */, ); - name = SwiftIconFont; path = SwiftIconFont; sourceTree = ""; }; @@ -337,6 +332,11 @@ attributes = { LastSwiftUpdateCheck = 0830; LastUpgradeCheck = 0700; + TargetAttributes = { + DCB2B03C26F284864226302AFAEC546C = { + LastSwiftMigration = 0900; + }; + }; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -528,7 +528,8 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; 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 = ""; @@ -601,7 +602,8 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - 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 = ""; diff --git a/LGButton/Classes/SwiftIconFont/FontLoader.swift b/LGButton/Classes/SwiftIconFont/FontLoader.swift index ca28619..4054a66 100755 --- a/LGButton/Classes/SwiftIconFont/FontLoader.swift +++ b/LGButton/Classes/SwiftIconFont/FontLoader.swift @@ -30,7 +30,7 @@ class FontLoader: NSObject { let font = CGFont.init(provider!) var error: Unmanaged? - if !CTFontManagerRegisterGraphicsFont(font, &error) { + if !CTFontManagerRegisterGraphicsFont(font!, &error) { let errorDescription: CFString = CFErrorCopyDescription(error!.takeUnretainedValue()) let nsError = error!.takeUnretainedValue() as AnyObject as! NSError NSException(name: NSExceptionName.internalInconsistencyException, reason: errorDescription as String, userInfo: [NSUnderlyingErrorKey: nsError]).raise() diff --git a/LGButton/Classes/SwiftIconFont/SwiftIconFont.swift b/LGButton/Classes/SwiftIconFont/SwiftIconFont.swift index 7e67fc7..4acd922 100755 --- a/LGButton/Classes/SwiftIconFont/SwiftIconFont.swift +++ b/LGButton/Classes/SwiftIconFont/SwiftIconFont.swift @@ -65,7 +65,7 @@ public extension UIImage let paragraphStyle = NSMutableParagraphStyle() paragraphStyle.alignment = NSTextAlignment.center - drawText!.draw(in: CGRect(x:0, y:0, width:imageSize.width, height:imageSize.height), withAttributes: [NSFontAttributeName : UIFont.icon(from: font, ofSize: size), NSParagraphStyleAttributeName: paragraphStyle, NSForegroundColorAttributeName: iconColor]) + drawText!.draw(in: CGRect(x:0, y:0, width:imageSize.width, height:imageSize.height), withAttributes: [NSAttributedStringKey.font : UIFont.icon(from: font, ofSize: size), NSAttributedStringKey.paragraphStyle: paragraphStyle, NSAttributedStringKey.foregroundColor: iconColor]) let image = UIGraphicsGetImageFromCurrentImageContext() UIGraphicsEndImageContext() @@ -204,7 +204,7 @@ func getAttributedString(_ text: NSString, ofSize size: CGFloat) -> NSMutableAtt if let _ = fontArr[fontCode] { attributedString.replaceCharacters(in: substringRange, with: String.getIcon(from: fontType, code: fontCode)!) let newRange = NSRange(location: substringRange.location, length: 1) - attributedString.addAttribute(NSFontAttributeName, value: UIFont.icon(from: fontType, ofSize: size), range: newRange) + attributedString.addAttribute(NSAttributedStringKey.font, value: UIFont.icon(from: fontType, ofSize: size), range: newRange) } } From 0efd08c64ec7fa489d3df1d66ca53241e68055e7 Mon Sep 17 00:00:00 2001 From: Lorenzo Greco Date: Wed, 11 Oct 2017 14:37:41 -0400 Subject: [PATCH 2/2] Version bump --- LGButton.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LGButton.podspec b/LGButton.podspec index 13db1f5..0b3b06b 100644 --- a/LGButton.podspec +++ b/LGButton.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'LGButton' - s.version = '1.0.3' + s.version = '1.0.4' s.summary = 'A fully customisable subclass of the native UIControl which allows you to create beautiful buttons without writing any line of code.' s.homepage = 'https://cocoapods.org/pods/LGButton' s.license = { :type => 'MIT', :file => 'LICENSE.md' }