From 6a34014346c9feb04f3ef327ba97dc4ecf5e95af Mon Sep 17 00:00:00 2001 From: PiotrPawlus Date: Tue, 2 Oct 2018 10:03:19 +0200 Subject: [PATCH] Syntactic changes to make it Swift 4.2 friendly. --- Example/Pods/Pods.xcodeproj/project.pbxproj | 8 +++----- Example/SelectableView.xcodeproj/project.pbxproj | 4 ++-- SelectableView/Classes/SelectableTokenScrollView.swift | 2 +- SelectableView/Classes/SelectableTokenView.swift | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index d771baf..535c7be 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -268,7 +268,7 @@ LastUpgradeCheck = 0700; TargetAttributes = { 1F58EEF2E4728FA57A0C1592D481118D = { - LastSwiftMigration = 0920; + LastSwiftMigration = 1000; }; }; }; @@ -397,6 +397,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_VERSION = 4.2; SYMROOT = "${SRCROOT}/../build"; VALIDATE_PRODUCT = YES; }; @@ -442,6 +443,7 @@ ONLY_ACTIVE_ARCH = YES; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_VERSION = 4.2; SYMROOT = "${SRCROOT}/../build"; }; name = Debug; @@ -472,8 +474,6 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -505,8 +505,6 @@ PRODUCT_NAME = BSSelectableView; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; diff --git a/Example/SelectableView.xcodeproj/project.pbxproj b/Example/SelectableView.xcodeproj/project.pbxproj index ff7b9fa..f7b4f54 100644 --- a/Example/SelectableView.xcodeproj/project.pbxproj +++ b/Example/SelectableView.xcodeproj/project.pbxproj @@ -363,7 +363,7 @@ PROVISIONING_PROFILE_SPECIFIER = "Universal App Development"; SWIFT_OBJC_BRIDGING_HEADER = "SelectableView-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -383,7 +383,7 @@ PROVISIONING_PROFILE_SPECIFIER = "Universal App Distribution"; SWIFT_OBJC_BRIDGING_HEADER = "SelectableView-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/SelectableView/Classes/SelectableTokenScrollView.swift b/SelectableView/Classes/SelectableTokenScrollView.swift index d8f05ad..7be1def 100644 --- a/SelectableView/Classes/SelectableTokenScrollView.swift +++ b/SelectableView/Classes/SelectableTokenScrollView.swift @@ -39,7 +39,7 @@ open class HorizontalTokenView: UIScrollView { if let tokenView = selectableView?.tokenView(for: options[index]) { - tokenView.autoresizingMask = UIViewAutoresizing() + tokenView.autoresizingMask = UIView.AutoresizingMask() addSubview(tokenView) tokenViews.append(tokenView) } diff --git a/SelectableView/Classes/SelectableTokenView.swift b/SelectableView/Classes/SelectableTokenView.swift index 2f51de5..583c502 100644 --- a/SelectableView/Classes/SelectableTokenView.swift +++ b/SelectableView/Classes/SelectableTokenView.swift @@ -40,7 +40,7 @@ open class VerticalTokenView: UIControl { if let tokenView = selectableView?.tokenView(for: options[index]) { - tokenView.autoresizingMask = UIViewAutoresizing() + tokenView.autoresizingMask = UIView.AutoresizingMask() addSubview(tokenView) tokenViews.append(tokenView) }