From dbfbc9a2801d5023a490ac454271dde4238c76e0 Mon Sep 17 00:00:00 2001 From: captainOfM Date: Tue, 2 Apr 2019 15:47:30 +0300 Subject: [PATCH] update to swift 5 --- TwicketSegmentedControl/TwicketSegmentedControl.swift | 4 ++-- .../TwicketSegmentedControlDemo.xcodeproj/project.pbxproj | 5 +++-- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 TwicketSegmentedControlDemo/TwicketSegmentedControlDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/TwicketSegmentedControl/TwicketSegmentedControl.swift b/TwicketSegmentedControl/TwicketSegmentedControl.swift index 030f3b2..c9eb18c 100644 --- a/TwicketSegmentedControl/TwicketSegmentedControl.swift +++ b/TwicketSegmentedControl/TwicketSegmentedControl.swift @@ -13,7 +13,7 @@ public protocol TwicketSegmentedControlDelegate: class { } open class TwicketSegmentedControl: UIControl { - open static let height: CGFloat = Constants.height + Constants.topBottomMargin * 2 + public static let height: CGFloat = Constants.height + Constants.topBottomMargin * 2 private struct Constants { static let height: CGFloat = 30 @@ -88,7 +88,7 @@ open class TwicketSegmentedControl: UIControl { } } - open var font: UIFont = UIFont.systemFont(ofSize: 15, weight: UIFontWeightMedium) { + open var font: UIFont = UIFont.systemFont(ofSize: 15, weight: UIFont.Weight.medium) { didSet { updateLabelsFont(with: font) } diff --git a/TwicketSegmentedControlDemo/TwicketSegmentedControlDemo.xcodeproj/project.pbxproj b/TwicketSegmentedControlDemo/TwicketSegmentedControlDemo.xcodeproj/project.pbxproj index 73b188e..cc2a4a9 100644 --- a/TwicketSegmentedControlDemo/TwicketSegmentedControlDemo.xcodeproj/project.pbxproj +++ b/TwicketSegmentedControlDemo/TwicketSegmentedControlDemo.xcodeproj/project.pbxproj @@ -202,6 +202,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -426,7 +427,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -450,7 +451,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "Pol-Quintana.TwicketSegmentedControl"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; diff --git a/TwicketSegmentedControlDemo/TwicketSegmentedControlDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/TwicketSegmentedControlDemo/TwicketSegmentedControlDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/TwicketSegmentedControlDemo/TwicketSegmentedControlDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + +