Merge pull request #69 from recruit-lifestyle/develop

update to swift4.2
recruit-lifestyle · Jan 10, 2019 · 6155295 · 6155295
2 parents 0c09a44 + c417b1b
commit 6155295
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 20 deletions.
diff --git a/.swift-version b/.swift-version
diff --git a/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj b/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj b/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj
@@ -231,21 +231,21 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0730;
- LastUpgradeCheck = 0800;
+ LastUpgradeCheck = 1010;
  ORGANIZATIONNAME = rain;
  TargetAttributes = {
  B7E3A1A91CCC6448005F680E = {
  CreatedOnToolsVersion = 7.3;
- LastSwiftMigration = 0800;
+ LastSwiftMigration = 1010;
  };
  B7E3A1BD1CCC6449005F680E = {
  CreatedOnToolsVersion = 7.3;
- LastSwiftMigration = 0800;
+ LastSwiftMigration = 1010;
  TestTargetID = B7E3A1A91CCC6448005F680E;
  };
  B7E3A1C81CCC6449005F680E = {
  CreatedOnToolsVersion = 7.3;
- LastSwiftMigration = 0800;
+ LastSwiftMigration = 1010;
  TestTargetID = B7E3A1A91CCC6448005F680E;
  };
  };
@@ -414,14 +414,22 @@
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
  CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
  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_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;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
  CLANG_WARN_SUSPICIOUS_MOVE = YES;
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -463,14 +471,22 @@
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
  CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
  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_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;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
  CLANG_WARN_SUSPICIOUS_MOVE = YES;
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -507,7 +523,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-Example";
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  };
  name = Debug;
  };
@@ -522,7 +538,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-Example";
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  };
  name = Release;
  };
@@ -534,7 +550,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-ExampleTests";
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SmileLock-Example.app/SmileLock-Example";
  };
  name = Debug;
@@ -547,7 +563,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-ExampleTests";
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SmileLock-Example.app/SmileLock-Example";
  };
  name = Release;
@@ -559,7 +575,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-ExampleUITests";
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  TEST_TARGET_NAME = "SmileLock-Example";
  };
  name = Debug;
@@ -571,7 +587,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-ExampleUITests";
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
  TEST_TARGET_NAME = "SmileLock-Example";
  };
  name = Release;

diff --git a/SmileLock-Example/SmileLock-Example/AppDelegate.swift b/SmileLock-Example/SmileLock-Example/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
  var window: UIWindow?
 
- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
  // Override point for customization after application launch.
  return true
  }

diff --git a/SmileLock.podspec b/SmileLock.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = "SmileLock"
- s.version = "3.0.5"
+ s.version = "3.0.6"
  s.summary = "A library for make a beautiful Passcode Lock View."
  s.description = <<-DESC
  1. Create a beautiful passcode lock view simply.
@@ -16,6 +16,7 @@ Pod::Spec.new do |s|
 
  s.author = { 'Rain' => 'liu044100@gmail.com' }
 
+ s.swift_version = "4.2"
  s.platform = :ios, '9.0'
  s.requires_arc = true
  s.source = { :git => "https://github.com/recruit-lifestyle/Smile-Lock.git", :tag => s.version.to_s}

diff --git a/SmileLock/Classes/PasswordContainerView.swift b/SmileLock/Classes/PasswordContainerView.swift
@@ -52,7 +52,7 @@ open class PasswordContainerView: UIView {
  open override var tintColor: UIColor! {
  didSet {
  guard !isVibrancyEffect else { return }
- deleteButton.setTitleColor(tintColor, for: UIControlState())
+ deleteButton.setTitleColor(tintColor, for: .normal)
  passwordDotView.strokeColor = tintColor
  touchAuthenticationButton.tintColor = tintColor
  passwordInputViews.forEach {
@@ -151,7 +151,7 @@ open class PasswordContainerView: UIView {
  }
  }
 
- touchAuthenticationButton.setImage(image, for: UIControlState())
+ touchAuthenticationButton.setImage(image, for: .normal)
  touchAuthenticationButton.tintColor = tintColor
  }
 

diff --git a/SmileLock/Classes/PasswordDotView.swift b/SmileLock/Classes/PasswordDotView.swift
@@ -123,7 +123,7 @@ open class PasswordDotView: UIView {
 private extension PasswordDotView {
  //MARK: Animation
  func shakeAnimation(withDuration duration: TimeInterval, animations: @escaping () -> (), completion: @escaping () -> ()) {
- UIView.animate(withDuration: duration, delay: 0, usingSpringWithDamping: 0.01, initialSpringVelocity: 0.35, options: UIViewAnimationOptions(), animations: {
+ UIView.animate(withDuration: duration, delay: 0, usingSpringWithDamping: 0.01, initialSpringVelocity: 0.35, options: .curveEaseInOut, animations: {
  animations()
  }) { _ in
  completion()

diff --git a/SmileLock/Classes/PasswordInputView.swift b/SmileLock/Classes/PasswordInputView.swift
@@ -19,7 +19,7 @@ open class PasswordInputView: UIView {
 
  let circleView = UIView()
  let button = UIButton()
- open let label = UILabel()
+ public let label = UILabel()
  open var labelFont: UIFont?
  fileprivate let fontSizeRatio: CGFloat = 46 / 40
  fileprivate let borderWidthRatio: CGFloat = 1 / 26