Merge pull request #16 from LeoMobileDeveloper/Swift4.0

LeoMobileDeveloper · web-flow · commit ddbac65433d7 · 2017-09-26T08:43:00.000-05:00
Migrate to swift4
diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		B3B5411D1F061C4500408912 /* PullToRefreshKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3B5411C1F061C3800408912 /* PullToRefreshKit.framework */; };
-		B3B5411E1F061E4300408912 /* PullToRefreshKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3B5411C1F061C3800408912 /* PullToRefreshKit.framework */; };
 		B3B5411F1F061E4300408912 /* PullToRefreshKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B3B5411C1F061C3800408912 /* PullToRefreshKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B3B543D91F062A9700408912 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3B542FB1F062A9700408912 /* AppDelegate.swift */; };
 		B3B543DA1F062A9700408912 /* arrow_down@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B3B542FC1F062A9700408912 /* arrow_down@3x.png */; };
@@ -143,7 +142,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				B3B5411D1F061C4500408912 /* PullToRefreshKit.framework in Frameworks */,
-				B3B5411E1F061E4300408912 /* PullToRefreshKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -274,13 +272,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = Leo;
 				TargetAttributes = {
 					52E8FB3B1D336E26000D0BF1 = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = R7X999328A;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
@@ -437,14 +435,20 @@
 				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_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_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;
@@ -467,7 +471,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -486,14 +490,20 @@
 				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_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_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;
@@ -510,7 +520,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -530,7 +540,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Leo.PullToRefreshKitd;
 				PRODUCT_MODULE_NAME = Demo;
 				PRODUCT_NAME = Demo;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -545,7 +556,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Leo.PullToRefreshKitd;
 				PRODUCT_MODULE_NAME = Demo;
 				PRODUCT_NAME = Demo;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/Demo/Demo/MainViewController.swift b/Demo/Demo/MainViewController.swift
@@ -45,6 +45,10 @@ class MainViewController: UITableViewController {
             header.setThemeColor(themeColor: UIColor.blue)
         }
         self.tableView.tableFooterView = UIView(frame: CGRect.zero)
+        if #available(iOS 11.0, *) {
+            self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentBehavior.never
+        } else {
+        }
     }
     
     override func numberOfSections(in tableView: UITableView) -> Int {
diff --git a/Demo/Demo/YahooWeatherRefreshHeader.swift b/Demo/Demo/YahooWeatherRefreshHeader.swift
@@ -54,7 +54,7 @@ class YahooWeatherRefreshHeader: UIView,RefreshableHeader{
         imageView.startAnimating()
         self.perform(#selector(YahooWeatherRefreshHeader.transitionFinihsed), with: nil, afterDelay: imageView.animationDuration)
     }
-    func transitionFinihsed(){
+    @objc func transitionFinihsed(){
         imageView.stopAnimating()
         let images = (73...109).map({return $0 < 100 ? "sun_000\($0)" : "sun_00\($0)"}).map({UIImage(named:$0)!})
         imageView.animationImages = images
diff --git a/Demo/Demo/YoukuTableViewController.swift b/Demo/Demo/YoukuTableViewController.swift
@@ -35,7 +35,7 @@ class YoukuTableViewController:BaseTableViewController{
         sw.addTarget(self, action: #selector(YoukuTableViewController.switchValueChanged(_:)), for: UIControlEvents.valueChanged)
         self.navigationItem.rightBarButtonItem = rightItem
     }
-    func switchValueChanged(_ sender:UISwitch){
+    @objc func switchValueChanged(_ sender:UISwitch){
         refreshHeader?.backgroundImageView.isHidden = !sender.isOn
     }
 }
diff --git a/PullToRefreshKit.podspec b/PullToRefreshKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'PullToRefreshKit'
-  s.version          = '0.6.0'
+  s.version          = '0.7.0'
   s.summary          = 'A refresh library written with pure Swift 3'
   s.description      = <<-DESC
 This is a pull to refresh library written by pure Swift 3. Using it you can add pull to refresh,pull to load more,pull left/right to view details within one line. Besides,it is quite easy to write a custom refresh view when using this lib.
diff --git a/PullToRefreshKit.xcodeproj/project.pbxproj b/PullToRefreshKit.xcodeproj/project.pbxproj
@@ -158,12 +158,13 @@
 		B3B540BF1F061B8300408912 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Leo Huang";
 				TargetAttributes = {
 					B3B540C71F061B8300408912 = {
 						CreatedOnToolsVersion = 8.3;
 						DevelopmentTeam = R7X999328A;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -239,21 +240,28 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				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_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_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;
@@ -277,7 +285,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -293,21 +301,28 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				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_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_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;
@@ -325,7 +340,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -352,7 +367,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "Leo-Huang.PullToRefreshKit";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -372,7 +388,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "Leo-Huang.PullToRefreshKit";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/PullToRefreshKit.xcodeproj/xcshareddata/xcschemes/PullToRefreshKit.xcscheme b/PullToRefreshKit.xcodeproj/xcshareddata/xcschemes/PullToRefreshKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/README.md b/README.md
@@ -49,9 +49,9 @@
 ## Require
 
 - iOS 8
-- Swift 3.0
+- Swift 4.0
 
-For Swift 2.3, See branch [Swift2](https://github.com/LeoMobileDeveloper/PullToRefreshKit/tree/Swift2)
+For Swift 3, See branch [Swift3](https://github.com/LeoMobileDeveloper/PullToRefreshKit/tree/Swift3)
 
 ## Support
 
diff --git a/Source/Classes/Footer.swift b/Source/Classes/Footer.swift
@@ -100,7 +100,7 @@ open class DefaultRefreshFooter:UIView, RefreshableFooter, Tintable{
     public required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    func catchTap(_ tap:UITapGestureRecognizer){
+    @objc func catchTap(_ tap:UITapGestureRecognizer){
         let scrollView = self.superview?.superview as? UIScrollView
         scrollView?.beginFooterRefreshing()
     }
diff --git a/Source/Classes/Header.swift b/Source/Classes/Header.swift
@@ -318,7 +318,7 @@ open class RefreshHeaderContainer:UIView{
             }
         }
     }
-    func updateStateToIdea(){
+    @objc func updateStateToIdea(){
         self.state = .idle
         clearTimer()
     }
diff --git a/Source/Classes/Left.swift b/Source/Classes/Left.swift
@@ -13,8 +13,8 @@ public enum RefreshKitLeftRightText{
     case scrollToAction
     case releaseToAction
 }
-
-open class DefaultRefreshLeft:UIView, RefreshableLeftRight, Tintable {
+@objcMembers
+open class DefaultRefreshLeft: UIView, RefreshableLeftRight, Tintable {
     open let imageView:UIImageView = UIImageView()
     open let textLabel:UILabel  = UILabel().SetUp {
         $0.font = UIFont.systemFont(ofSize: 14)
@@ -44,7 +44,7 @@ open class DefaultRefreshLeft:UIView, RefreshableLeftRight, Tintable {
         textDic[.releaseToAction] = PullToRefreshKitLeftString.releaseToClose
         textLabel.text = textDic[.scrollToAction]
     }
-   public required init?(coder aDecoder: NSCoder) {
+    public required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
     open override func layoutSubviews() {
@@ -76,10 +76,10 @@ open class DefaultRefreshLeft:UIView, RefreshableLeftRight, Tintable {
             })
         }
     }
-   open func didBeginRefreshing() {
+    open func didBeginRefreshing() {
 
     }
-   open func didCompleteEndRefershingAnimation() {
+    open func didCompleteEndRefershingAnimation() {
         textLabel.text = textDic[.scrollToAction]
     }
     
diff --git a/Source/Classes/PullToRefresh.swift b/Source/Classes/PullToRefresh.swift
@@ -133,6 +133,7 @@ public extension SetUp where Self: AnyObject {
 extension NSObject: SetUp {}
 
 //Header
+
 public extension UIScrollView{
     @discardableResult
     public func setUpHeaderRefresh(_ action:@escaping ()->())->DefaultRefreshHeader{

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ class MainViewController: UITableViewController {`
`45`	`45`	`header.setThemeColor(themeColor: UIColor.blue)`
`46`	`46`	`}`
`47`	`47`	`self.tableView.tableFooterView = UIView(frame: CGRect.zero)`
	`48`	`+ if #available(iOS 11.0, *) {`
	`49`	`+ self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentBehavior.never`
	`50`	`+ } else {`
	`51`	`+ }`
`48`	`52`	`}`
`49`	`53`
`50`	`54`	`override func numberOfSections(in tableView: UITableView) -> Int {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class YahooWeatherRefreshHeader: UIView,RefreshableHeader{`
`54`	`54`	`imageView.startAnimating()`
`55`	`55`	`self.perform(#selector(YahooWeatherRefreshHeader.transitionFinihsed), with: nil, afterDelay: imageView.animationDuration)`
`56`	`56`	`}`
`57`		`- func transitionFinihsed(){`
	`57`	`+ @objc func transitionFinihsed(){`
`58`	`58`	`imageView.stopAnimating()`
`59`	`59`	`let images = (73...109).map({return $0 < 100 ? "sun_000\($0)" : "sun_00\($0)"}).map({UIImage(named:$0)!})`
`60`	`60`	`imageView.animationImages = images`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class YoukuTableViewController:BaseTableViewController{`
`35`	`35`	`sw.addTarget(self, action: #selector(YoukuTableViewController.switchValueChanged(_:)), for: UIControlEvents.valueChanged)`
`36`	`36`	`self.navigationItem.rightBarButtonItem = rightItem`
`37`	`37`	`}`
`38`		`- func switchValueChanged(_ sender:UISwitch){`
	`38`	`+ @objc func switchValueChanged(_ sender:UISwitch){`
`39`	`39`	`refreshHeader?.backgroundImageView.isHidden = !sender.isOn`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ open class DefaultRefreshFooter:UIView, RefreshableFooter, Tintable{`
`100`	`100`	`public required init?(coder aDecoder: NSCoder) {`
`101`	`101`	`fatalError("init(coder:) has not been implemented")`
`102`	`102`	`}`
`103`		`- func catchTap(_ tap:UITapGestureRecognizer){`
	`103`	`+ @objc func catchTap(_ tap:UITapGestureRecognizer){`
`104`	`104`	`let scrollView = self.superview?.superview as? UIScrollView`
`105`	`105`	`scrollView?.beginFooterRefreshing()`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ open class RefreshHeaderContainer:UIView{`
`318`	`318`	`}`
`319`	`319`	`}`
`320`	`320`	`}`
`321`		`- func updateStateToIdea(){`
	`321`	`+ @objc func updateStateToIdea(){`
`322`	`322`	`self.state = .idle`
`323`	`323`	`clearTimer()`
`324`	`324`	`}`