Updated to Swift 4.2

rolandleth · Sep 17, 2018 · 4197f9d · 4197f9d
1 parent 1aa26f8
commit 4197f9d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/RadioButtonDemo/RadioButtonDemo.xcodeproj/project.pbxproj b/RadioButtonDemo/RadioButtonDemo.xcodeproj/project.pbxproj
@@ -164,7 +164,7 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0810;
- LastUpgradeCheck = 0910;
+ LastUpgradeCheck = 1000;
  ORGANIZATIONNAME = "Roland Leth";
  TargetAttributes = {
  2AD5AD111DB7E8420002A252 = {
@@ -276,13 +276,15 @@
  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_ERROR;
  CLANG_WARN_DOCUMENTATION_COMMENTS = 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_ERROR;
  CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -334,13 +336,15 @@
  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_ERROR;
  CLANG_WARN_DOCUMENTATION_COMMENTS = 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_ERROR;
  CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -383,7 +387,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.rolandleth.RadioButtonDemo;
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  };
  name = Debug;
  };
@@ -398,7 +402,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.rolandleth.RadioButtonDemo;
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  };
  name = Release;
  };

diff --git a/...nDemo/RadioButtonDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/...nDemo/RadioButtonDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>
diff --git a/RadioButtonDemo/RadioButtonDemo/AppDelegate.swift b/RadioButtonDemo/RadioButtonDemo/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  var window: UIWindow? = UIWindow(frame: UIScreen.main.bounds)
 
 
- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 
  window?.rootViewController = ViewController()
  window?.makeKeyAndVisible()

diff --git a/RadioButtonDemo/RadioButtonDemoTests/RadioButtonDemoTests.swift b/RadioButtonDemo/RadioButtonDemoTests/RadioButtonDemoTests.swift
@@ -137,7 +137,7 @@ class RadioButtonDemoTests: XCTestCase {
 // "innerBorderWidth", "innerIncreasedWidth"
  ]
 
- let actual = Set(mirror.children.flatMap { $0.label })
+ let actual = Set(mirror.children.compactMap { $0.label })
  let difference = actual.symmetricDifference(expected)
 
  // ¯\-(ツ)-/¯ Not super-useful, I know.

diff --git a/source/LTHRadioButton.swift b/source/LTHRadioButton.swift
@@ -108,8 +108,8 @@ public class LTHRadioButton: UIView {
  borderWidth.duration = 0.2
  borderWidth.fromValue = 0.0
  borderWidth.toValue = innerBorderWidth
- borderWidth.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn)
- borderWidth.fillMode = kCAFillModeBackwards
+ borderWidth.timingFunction = CAMediaTimingFunction(name: .easeIn)
+ borderWidth.fillMode = .backwards
  borderWidth.beginTime = layer.lth_currentMediaTime
 
  return borderWidth
@@ -133,7 +133,7 @@ public class LTHRadioButton: UIView {
 
  group.duration = 0.1
  group.animations = [bounds, cornerRadius]
- group.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+ group.timingFunction = CAMediaTimingFunction(name: .easeOut)
  group.beginTime = layer.lth_currentMediaTime + 0.23
 
  return group
@@ -157,7 +157,7 @@ public class LTHRadioButton: UIView {
 
  group.duration = 0.15
  group.animations = [bounds, cornerRadius]
- group.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+ group.timingFunction = CAMediaTimingFunction(name: .easeOut)
  group.beginTime = layer.lth_currentMediaTime + 0.31
 
  return group
@@ -170,8 +170,8 @@ public class LTHRadioButton: UIView {
  borderColor.duration = 0.15
  borderColor.fromValue = deselectedColor.cgColor
  borderColor.toValue = selectedColor.cgColor
- borderColor.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
- borderColor.fillMode = kCAFillModeBackwards
+ borderColor.timingFunction = CAMediaTimingFunction(name: .linear)
+ borderColor.fillMode = .backwards
  borderColor.beginTime = layer.lth_currentMediaTime + 0.28
 
  return borderColor
@@ -198,7 +198,7 @@ public class LTHRadioButton: UIView {
 
  group.duration = 0.25
  group.animations = [bounds, cornerRadius]
- group.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+ group.timingFunction = CAMediaTimingFunction(name: .easeOut)
  group.beginTime = layer.lth_currentMediaTime + start
 
  return group
@@ -211,7 +211,7 @@ public class LTHRadioButton: UIView {
  opacity.duration = 0.31
  opacity.fromValue = 0.3
  opacity.toValue = 0
- opacity.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+ opacity.timingFunction = CAMediaTimingFunction(name: .easeOut)
  opacity.beginTime = layer.lth_currentMediaTime + 0.26
 
  return opacity
@@ -225,7 +225,7 @@ public class LTHRadioButton: UIView {
  borderWidth.duration = 0.26
  borderWidth.fromValue = frame.width * 0.3
  borderWidth.toValue = 0
- borderWidth.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+ borderWidth.timingFunction = CAMediaTimingFunction(name: .easeOut)
  borderWidth.beginTime = layer.lth_currentMediaTime + 0.29
 
  return borderWidth
@@ -248,7 +248,7 @@ public class LTHRadioButton: UIView {
 
  group.duration = duration
  group.animations = [borderWidth, opacity]
- group.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn)
+ group.timingFunction = CAMediaTimingFunction(name: .easeIn)
  group.beginTime = layer.lth_currentMediaTime
 
  return group
@@ -261,7 +261,7 @@ public class LTHRadioButton: UIView {
  borderColor.duration = duration
  borderColor.fromValue = selectedColor.cgColor
  borderColor.toValue = deselectedColor.cgColor
- borderColor.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+ borderColor.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
  borderColor.beginTime = layer.lth_currentMediaTime
 
  return borderColor