Update swift version to 5.0

Vincent · Vincent · commit 0a9dbcf7c1fb · 2019-04-22T17:22:45.000+08:00
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.2
+5.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-osx_image: xcode10.1
+osx_image: xcode10.2
 language: objective-c
 xcode_sdk: iphonesimulator12.1
 
diff --git a/ESTabBarController-swift.podspec b/ESTabBarController-swift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name              = 'ESTabBarController-swift'
-s.version           = '2.6.5'
+s.version           = '2.7'
 s.summary           = 'An easy way to customize tabBarController and tabBarItem.'
 s.homepage          = 'https://github.com/eggswift/ESTabBarController'
 
diff --git a/ESTabBarControllerExample/ESTabBarController/Info.plist b/ESTabBarControllerExample/ESTabBarController/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.5</string>
+	<string>2.7</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/ESTabBarControllerExample/ESTabBarControllerExample.xcodeproj/project.pbxproj b/ESTabBarControllerExample/ESTabBarControllerExample.xcodeproj/project.pbxproj
@@ -314,6 +314,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -557,7 +558,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.eggswift.ESTabBarControllerExample1;
 				PRODUCT_NAME = Example;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -577,7 +578,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.eggswift.ESTabBarControllerExample1;
 				PRODUCT_NAME = Example;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -599,7 +600,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -622,7 +623,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.eggswift.ESTabBarController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
diff --git a/ESTabBarControllerExample/ESTabBarControllerExample/Info.plist b/ESTabBarControllerExample/ESTabBarControllerExample/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.5</string>
+	<string>2.7</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.5</string>
+	<string>2.7</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
diff --git a/Sources/ESTabBar.swift b/Sources/ESTabBar.swift
@@ -162,7 +162,7 @@ open class ESTabBar: UITabBar {
 
 internal extension ESTabBar /* Layout */ {
     
-    internal func updateLayout() {
+    func updateLayout() {
         guard let tabBarItems = self.items else {
             ESTabBarController.printError("empty items")
             return
@@ -246,18 +246,18 @@ internal extension ESTabBar /* Layout */ {
 
 internal extension ESTabBar /* Actions */ {
     
-    internal func isMoreItem(_ index: Int) -> Bool {
+    func isMoreItem(_ index: Int) -> Bool {
         return ESTabBarController.isShowingMore(tabBarController) && (index == (items?.count ?? 0) - 1)
     }
     
-    internal func removeAll() {
+    func removeAll() {
         for container in containers {
             container.removeFromSuperview()
         }
         containers.removeAll()
     }
     
-    internal func reload() {
+    func reload() {
         removeAll()
         guard let tabBarItems = self.items else {
             ESTabBarController.printError("empty items")
@@ -280,7 +280,7 @@ internal extension ESTabBar /* Actions */ {
         self.setNeedsLayout()
     }
     
-    @objc internal func highlightAction(_ sender: AnyObject?) {
+    @objc func highlightAction(_ sender: AnyObject?) {
         guard let container = sender as? ESTabBarItemContainer else {
             return
         }
@@ -300,7 +300,7 @@ internal extension ESTabBar /* Actions */ {
         }
     }
     
-    @objc internal func dehighlightAction(_ sender: AnyObject?) {
+    @objc func dehighlightAction(_ sender: AnyObject?) {
         guard let container = sender as? ESTabBarItemContainer else {
             return
         }
@@ -320,16 +320,16 @@ internal extension ESTabBar /* Actions */ {
         }
     }
     
-    @objc internal func selectAction(_ sender: AnyObject?) {
+    @objc func selectAction(_ sender: AnyObject?) {
         guard let container = sender as? ESTabBarItemContainer else {
             return
         }
         select(itemAtIndex: container.tag - 1000, animated: true)
     }
     
-    @objc internal func select(itemAtIndex idx: Int, animated: Bool) {
+    @objc func select(itemAtIndex idx: Int, animated: Bool) {
         let newIndex = max(0, idx)
-        let currentIndex = (selectedItem != nil) ? (items?.index(of: selectedItem!) ?? -1) : -1
+        let currentIndex = (selectedItem != nil) ? (items?.firstIndex(of: selectedItem!) ?? -1) : -1
         guard newIndex < items?.count ?? 0, let item = self.items?[newIndex], item.isEnabled == true else {
             return
         }
@@ -401,7 +401,7 @@ internal extension ESTabBar /* Actions */ {
         self.updateAccessibilityLabels()
     }
     
-    internal func updateAccessibilityLabels() {
+    func updateAccessibilityLabels() {
         guard let tabBarItems = self.items, tabBarItems.count == self.containers.count else {
             return
         }
diff --git a/Sources/ESTabBarController.swift b/Sources/ESTabBarController.swift
@@ -63,7 +63,7 @@ open class ESTabBarController: UITabBarController, ESTabBarDelegate {
                 ignoreNextSelection = false
                 return
             }
-            guard let tabBar = self.tabBar as? ESTabBar, let items = tabBar.items, let index = viewControllers?.index(of: newValue) else {
+            guard let tabBar = self.tabBar as? ESTabBar, let items = tabBar.items, let index = viewControllers?.firstIndex(of: newValue) else {
                 return
             }
             let value = (ESTabBarController.isShowingMore(self) && index > items.count - 1) ? items.count - 1 : index
@@ -101,7 +101,7 @@ open class ESTabBarController: UITabBarController, ESTabBarDelegate {
 
     // MARK: - UITabBar delegate
     open override func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
-        guard let idx = tabBar.items?.index(of: item) else {
+        guard let idx = tabBar.items?.firstIndex(of: item) else {
             return;
         }
         if idx == tabBar.items!.count - 1, ESTabBarController.isShowingMore(self) {
@@ -130,21 +130,21 @@ open class ESTabBarController: UITabBarController, ESTabBarDelegate {
     
     // MARK: - ESTabBar delegate
     internal func tabBar(_ tabBar: UITabBar, shouldSelect item: UITabBarItem) -> Bool {
-        if let idx = tabBar.items?.index(of: item), let vc = viewControllers?[idx] {
+        if let idx = tabBar.items?.firstIndex(of: item), let vc = viewControllers?[idx] {
             return delegate?.tabBarController?(self, shouldSelect: vc) ?? true
         }
         return true
     }
     
     internal func tabBar(_ tabBar: UITabBar, shouldHijack item: UITabBarItem) -> Bool {
-        if let idx = tabBar.items?.index(of: item), let vc = viewControllers?[idx] {
+        if let idx = tabBar.items?.firstIndex(of: item), let vc = viewControllers?[idx] {
             return shouldHijackHandler?(self, vc, idx) ?? false
         }
         return false
     }
     
     internal func tabBar(_ tabBar: UITabBar, didHijack item: UITabBarItem) {
-        if let idx = tabBar.items?.index(of: item), let vc = viewControllers?[idx] {
+        if let idx = tabBar.items?.firstIndex(of: item), let vc = viewControllers?[idx] {
             didHijackHandler?(self, vc, idx)
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-osx_image: xcode10.1`
	`1`	`+osx_image: xcode10.2`
`2`	`2`	`language: objective-c`
`3`	`3`	`xcode_sdk: iphonesimulator12.1`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ open class ESTabBar: UITabBar {`
`162`	`162`
`163`	`163`	`internal extension ESTabBar /* Layout */ {`
`164`	`164`
`165`		`- internal func updateLayout() {`
	`165`	`+ func updateLayout() {`
`166`	`166`	`guard let tabBarItems = self.items else {`
`167`	`167`	`ESTabBarController.printError("empty items")`
`168`	`168`	`return`
`@@ -246,18 +246,18 @@ internal extension ESTabBar /* Layout */ {`
`246`	`246`
`247`	`247`	`internal extension ESTabBar /* Actions */ {`
`248`	`248`
`249`		`- internal func isMoreItem(_ index: Int) -> Bool {`
	`249`	`+ func isMoreItem(_ index: Int) -> Bool {`
`250`	`250`	`return ESTabBarController.isShowingMore(tabBarController) && (index == (items?.count ?? 0) - 1)`
`251`	`251`	`}`
`252`	`252`
`253`		`- internal func removeAll() {`
	`253`	`+ func removeAll() {`
`254`	`254`	`for container in containers {`
`255`	`255`	`container.removeFromSuperview()`
`256`	`256`	`}`
`257`	`257`	`containers.removeAll()`
`258`	`258`	`}`
`259`	`259`
`260`		`- internal func reload() {`
	`260`	`+ func reload() {`
`261`	`261`	`removeAll()`
`262`	`262`	`guard let tabBarItems = self.items else {`
`263`	`263`	`ESTabBarController.printError("empty items")`
`@@ -280,7 +280,7 @@ internal extension ESTabBar /* Actions */ {`
`280`	`280`	`self.setNeedsLayout()`
`281`	`281`	`}`
`282`	`282`
`283`		`- @objc internal func highlightAction(_ sender: AnyObject?) {`
	`283`	`+ @objc func highlightAction(_ sender: AnyObject?) {`
`284`	`284`	`guard let container = sender as? ESTabBarItemContainer else {`
`285`	`285`	`return`
`286`	`286`	`}`
`@@ -300,7 +300,7 @@ internal extension ESTabBar /* Actions */ {`
`300`	`300`	`}`
`301`	`301`	`}`
`302`	`302`
`303`		`- @objc internal func dehighlightAction(_ sender: AnyObject?) {`
	`303`	`+ @objc func dehighlightAction(_ sender: AnyObject?) {`
`304`	`304`	`guard let container = sender as? ESTabBarItemContainer else {`
`305`	`305`	`return`
`306`	`306`	`}`
`@@ -320,16 +320,16 @@ internal extension ESTabBar /* Actions */ {`
`320`	`320`	`}`
`321`	`321`	`}`
`322`	`322`
`323`		`- @objc internal func selectAction(_ sender: AnyObject?) {`
	`323`	`+ @objc func selectAction(_ sender: AnyObject?) {`
`324`	`324`	`guard let container = sender as? ESTabBarItemContainer else {`
`325`	`325`	`return`
`326`	`326`	`}`
`327`	`327`	`select(itemAtIndex: container.tag - 1000, animated: true)`
`328`	`328`	`}`
`329`	`329`
`330`		`- @objc internal func select(itemAtIndex idx: Int, animated: Bool) {`
	`330`	`+ @objc func select(itemAtIndex idx: Int, animated: Bool) {`
`331`	`331`	`let newIndex = max(0, idx)`
`332`		`- let currentIndex = (selectedItem != nil) ? (items?.index(of: selectedItem!) ?? -1) : -1`
	`332`	`+ let currentIndex = (selectedItem != nil) ? (items?.firstIndex(of: selectedItem!) ?? -1) : -1`
`333`	`333`	`guard newIndex < items?.count ?? 0, let item = self.items?[newIndex], item.isEnabled == true else {`
`334`	`334`	`return`
`335`	`335`	`}`
`@@ -401,7 +401,7 @@ internal extension ESTabBar /* Actions */ {`
`401`	`401`	`self.updateAccessibilityLabels()`
`402`	`402`	`}`
`403`	`403`
`404`		`- internal func updateAccessibilityLabels() {`
	`404`	`+ func updateAccessibilityLabels() {`
`405`	`405`	`guard let tabBarItems = self.items, tabBarItems.count == self.containers.count else {`
`406`	`406`	`return`
`407`	`407`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ open class ESTabBarController: UITabBarController, ESTabBarDelegate {`
`63`	`63`	`ignoreNextSelection = false`
`64`	`64`	`return`
`65`	`65`	`}`
`66`		`- guard let tabBar = self.tabBar as? ESTabBar, let items = tabBar.items, let index = viewControllers?.index(of: newValue) else {`
	`66`	`+ guard let tabBar = self.tabBar as? ESTabBar, let items = tabBar.items, let index = viewControllers?.firstIndex(of: newValue) else {`
`67`	`67`	`return`
`68`	`68`	`}`
`69`	`69`	`let value = (ESTabBarController.isShowingMore(self) && index > items.count - 1) ? items.count - 1 : index`
`@@ -101,7 +101,7 @@ open class ESTabBarController: UITabBarController, ESTabBarDelegate {`
`101`	`101`
`102`	`102`	`// MARK: - UITabBar delegate`
`103`	`103`	`open override func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {`
`104`		`- guard let idx = tabBar.items?.index(of: item) else {`
	`104`	`+ guard let idx = tabBar.items?.firstIndex(of: item) else {`
`105`	`105`	`return;`
`106`	`106`	`}`
`107`	`107`	`if idx == tabBar.items!.count - 1, ESTabBarController.isShowingMore(self) {`
`@@ -130,21 +130,21 @@ open class ESTabBarController: UITabBarController, ESTabBarDelegate {`
`130`	`130`
`131`	`131`	`// MARK: - ESTabBar delegate`
`132`	`132`	`internal func tabBar(_ tabBar: UITabBar, shouldSelect item: UITabBarItem) -> Bool {`
`133`		`- if let idx = tabBar.items?.index(of: item), let vc = viewControllers?[idx] {`
	`133`	`+ if let idx = tabBar.items?.firstIndex(of: item), let vc = viewControllers?[idx] {`
`134`	`134`	`return delegate?.tabBarController?(self, shouldSelect: vc) ?? true`
`135`	`135`	`}`
`136`	`136`	`return true`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`internal func tabBar(_ tabBar: UITabBar, shouldHijack item: UITabBarItem) -> Bool {`
`140`		`- if let idx = tabBar.items?.index(of: item), let vc = viewControllers?[idx] {`
	`140`	`+ if let idx = tabBar.items?.firstIndex(of: item), let vc = viewControllers?[idx] {`
`141`	`141`	`return shouldHijackHandler?(self, vc, idx) ?? false`
`142`	`142`	`}`
`143`	`143`	`return false`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`internal func tabBar(_ tabBar: UITabBar, didHijack item: UITabBarItem) {`
`147`		`- if let idx = tabBar.items?.index(of: item), let vc = viewControllers?[idx] {`
	`147`	`+ if let idx = tabBar.items?.firstIndex(of: item), let vc = viewControllers?[idx] {`
`148`	`148`	`didHijackHandler?(self, vc, idx)`
`149`	`149`	`}`
`150`	`150`	`}`