Merge branch 'master' into feature/indicator-custom-info

Author: pera

.swiftlint.yml

@@ -0,0 +1,51 @@
+disabled_rules: # rule identifiers to exclude from running
+#  - colon
+#  - comma
+#  - control_statement
+  - line_length
+  - function_body_length
+  - identifier_name
+  - type_name
+  - large_tuple
+opt_in_rules: # some rules are only opt-in
+  - empty_count
+  # Find all the available rules by running:
+  # swiftlint rules
+excluded: # paths to ignore during linting. Takes precedence over `included`.
+  - Carthage
+  - Pods
+  - Source/ExcludedFolder
+  - Source/ExcludedFile.swift
+
+# configurable rules can be customized from this configuration file
+# binary rules can set their severity level
+force_cast: warning # implicitly
+force_try:
+  severity: warning # explicitly
+# rules that have both warning and error levels, can set just the warning level
+# implicitly
+line_length: 200
+# they can set both implicitly with an array
+type_body_length:
+  - 300 # warning
+  - 400 # error
+# or they can set both explicitly
+file_length:
+  warning: 500
+  error: 1200
+# naming rules can set warnings/errors for min_length and max_length
+# additionally they can set excluded names
+type_name:
+  min_length: 4 # only warning
+  max_length: # warning and error
+    warning: 40
+    error: 50
+  excluded: iPhone # excluded via string
+identifier_name:
+  min_length: # only min_length
+    error: 4 # only error
+  excluded: # excluded via string array
+    - id
+    - URL
+    - GlobalAPIKey
+reporter: "xcode" # reporter type (xcode, json, csv, checkstyle, junit, html, emoji)

.travis.yml

@@ -1,7 +1,7 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode9
 env:
-  - DESTINATION="OS=10.0,name=iPhone 6s" SCHEME="XLPagerTabStrip" SDK=iphonesimulator10.0
+  - DESTINATION="OS=11.0,name=iPhone 7" SCHEME="XLPagerTabStrip" SDK=iphonesimulator
 before_install:
 - brew update
 #- brew outdated carthage || brew upgrade carthage

CHANGELOG.md

@@ -1,11 +1,16 @@
 # Change Log
 All notable changes to XLPagerTabStrip will be documented in this file.
 
+### [8.0.0](https://github.com/xmartlabs/XLPagerTabStrip/releases/tag/8.0.0)
+
+* Xcode 9 support. (Swift 4)
+* Bug fixes and stability improvements.
+
 ### [7.0.0](https://github.com/xmartlabs/XLPagerTabStrip/releases/tag/7.0.0)
 
 * Bug fixes and stability improvements. 
 
-### [6.0.0](https://github.com/xmartlabs/XLPagerTabStrip/releases/tag/5.0.0)
+### [6.0.0](https://github.com/xmartlabs/XLPagerTabStrip/releases/tag/6.0.0)
 
 * Swift 3 support
 * **Breaking change**: Swiftified names of functions (you can see more details about it [here](https://github.com/xmartlabs/XLPagerTabStrip/Migration.md))

Example.xcodeproj/project.pbxproj

@@ -295,15 +295,15 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				TargetAttributes = {
 					28F828CB1C4B714D00330CF4 = {
 						CreatedOnToolsVersion = 7.2;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 					28F828DF1C4B714D00330CF4 = {
 						CreatedOnToolsVersion = 7.2;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 						TestTargetID = 28F828CB1C4B714D00330CF4;
 					};
 				};
@@ -438,14 +438,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;
@@ -484,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;
@@ -528,7 +540,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -543,7 +556,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -556,7 +570,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.ExampleUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_TARGET_NAME = Example;
 				USES_XCTRUNNER = YES;
 			};
@@ -570,7 +585,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.ExampleUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_TARGET_NAME = Example;
 				USES_XCTRUNNER = YES;
 			};

Example/Example/AppDelegate.swift

@@ -12,15 +12,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
-        
+
         UITabBar.appearance().tintColor = UIColor.init(red: 0.027, green: 0.725, blue: 0.608, alpha: 1)
         UIApplication.shared.statusBarStyle = .lightContent
-        
-        let _ = YoutubeExampleViewController(nibName: nil, bundle: nil)
-        
+
+        _ = YoutubeExampleViewController(nibName: nil, bundle: nil)
+
         return true
     }
 
@@ -46,6 +45,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 
-
 }
-

Example/Example/BarExampleViewController.swift

@@ -27,51 +27,50 @@ import XLPagerTabStrip
 
 class BarExampleViewController: BarPagerTabStripViewController {
     var isReload = false
-    
+
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
-    
+
     override func viewDidLoad() {
-        
+
         // set up style before super view did load is executed
         settings.style.selectedBarBackgroundColor = .orange
         // - 
-        
+
         super.viewDidLoad()
     }
-    
+
     // MARK: - PagerTabStripDataSource
-    
+
     override func viewControllers(for pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
-        
+
         let child_1 = TableChildExampleViewController(style: .plain, itemInfo: "Table View")
         let child_2 = ChildExampleViewController(itemInfo: "View")
         let child_3 = TableChildExampleViewController(style: .grouped, itemInfo: "Table View 2")
         let child_4 = ChildExampleViewController(itemInfo: "View 2")
-        
+
         guard isReload else {
             return [child_1, child_2, child_3, child_4]
         }
-        
+
         var childViewControllers = [child_1, child_2, child_3, child_4]
-        for (index, _) in childViewControllers.enumerated(){
+        for index in childViewControllers.indices {
             let nElements = childViewControllers.count - index
             let n = (Int(arc4random()) % nElements) + index
-            if n != index{
-                swap(&childViewControllers[index], &childViewControllers[n])
+            if n != index {
+                childViewControllers.swapAt(index, n)
             }
         }
         let nItems = 1 + (arc4random() % 4)
         return Array(childViewControllers.prefix(Int(nItems)))
     }
-    
+
     override func reloadPagerTabStripView() {
         isReload = true
         if arc4random() % 2 == 0 {
             pagerBehaviour = .progressive(skipIntermediateViewControllers: arc4random() % 2 == 0, elasticIndicatorLimit: arc4random() % 2 == 0 )
-        }
-        else {
+        } else {
             pagerBehaviour = .common(skipIntermediateViewControllers: arc4random() % 2 == 0)
         }
         super.reloadPagerTabStripView()

Example/Example/ButtonBarExampleViewController.swift

@@ -26,18 +26,18 @@ import Foundation
 import XLPagerTabStrip
 
 class ButtonBarExampleViewController: ButtonBarPagerTabStripViewController {
-    
+
     var isReload = false
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+
         buttonBarView.selectedBar.backgroundColor = .orange
         buttonBarView.backgroundColor = UIColor(red: 7/255, green: 185/255, blue: 155/255, alpha: 1)
     }
-    
+
     // MARK: - PagerTabStripDataSource
-    
+
     override func viewControllers(for pagerTabStripController: PagerTabStripViewController) -> [UIViewController] {
         let child_1 = TableChildExampleViewController(style: .plain, itemInfo: "Table View")
         let child_2 = ChildExampleViewController(itemInfo: "View")
@@ -47,30 +47,29 @@ class ButtonBarExampleViewController: ButtonBarPagerTabStripViewController {
         let child_6 = ChildExampleViewController(itemInfo: "View 3")
         let child_7 = TableChildExampleViewController(style: .grouped, itemInfo: "Table View 4")
         let child_8 = ChildExampleViewController(itemInfo: "View 4")
-        
+
         guard isReload else {
             return [child_1, child_2, child_3, child_4, child_5, child_6, child_7, child_8]
         }
-        
-        var childViewControllers = [child_1, child_2, child_3, child_4, child_6, child_7, child_8]
-        
-        for (index, _) in childViewControllers.enumerated(){
+
+        var childViewControllers = [child_1, child_2, child_3, child_4, child_5, child_6, child_7, child_8]
+
+        for index in childViewControllers.indices {
             let nElements = childViewControllers.count - index
             let n = (Int(arc4random()) % nElements) + index
-            if n != index{
-                swap(&childViewControllers[index], &childViewControllers[n])
+            if n != index {
+                childViewControllers.swapAt(index, n)
             }
         }
         let nItems = 1 + (arc4random() % 8)
         return Array(childViewControllers.prefix(Int(nItems)))
     }
-    
+
     override func reloadPagerTabStripView() {
         isReload = true
         if arc4random() % 2 == 0 {
             pagerBehaviour = .progressive(skipIntermediateViewControllers: arc4random() % 2 == 0, elasticIndicatorLimit: arc4random() % 2 == 0 )
-        }
-        else {
+        } else {
             pagerBehaviour = .common(skipIntermediateViewControllers: arc4random() % 2 == 0)
         }
         super.reloadPagerTabStripView()

Example/Example/ChildControllers/ChildExampleViewController.swift

@@ -26,9 +26,9 @@ import Foundation
 import XLPagerTabStrip
 
 class ChildExampleViewController: UIViewController, IndicatorInfoProvider {
-    
+
     var itemInfo: IndicatorInfo = "View"
-    
+
     init(itemInfo: IndicatorInfo) {
         self.itemInfo = itemInfo
         super.init(nibName: nil, bundle: nil)
@@ -37,23 +37,23 @@ class ChildExampleViewController: UIViewController, IndicatorInfoProvider {
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+
         let label = UILabel()
         label.translatesAutoresizingMaskIntoConstraints = false
         label.text = "XLPagerTabStrip"
-        
+
         view.addSubview(label)
         view.backgroundColor = .white
-        
+
         view.addConstraint(NSLayoutConstraint(item: label, attribute: .centerX, relatedBy: .equal, toItem: view, attribute: .centerX, multiplier: 1, constant: 0))
         view.addConstraint(NSLayoutConstraint(item: label, attribute: .centerY, relatedBy: .equal, toItem: view, attribute: .centerY, multiplier: 1, constant: -50))
     }
-    
+
     // MARK: - IndicatorInfoProvider
-    
+
     func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
         return itemInfo
     }