Skip to content

Commit febc1fa

Browse files
author
nhannlt
committed
Upgrade to swift 5
1 parent fafd0b2 commit febc1fa

File tree

3 files changed

+26
-32
lines changed

3 files changed

+26
-32
lines changed

‎Spring/DesignableTabBarController.swift

+10-9
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import UIKit
4747
@IBInspectable var firstSelectedImage: UIImage? {
4848
didSet {
4949
if let image = firstSelectedImage {
50-
var tabBarItems = self.tabBar.items as [UITabBarItem]!
50+
var tabBarItems = self.tabBar.items as [UITabBarItem]?
5151
tabBarItems?[0].selectedImage = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
5252
}
5353
}
@@ -56,7 +56,7 @@ import UIKit
5656
@IBInspectable var secondSelectedImage: UIImage? {
5757
didSet {
5858
if let image = secondSelectedImage {
59-
var tabBarItems = self.tabBar.items as [UITabBarItem]!
59+
var tabBarItems = self.tabBar.items as [UITabBarItem]?
6060
tabBarItems?[1].selectedImage = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
6161
}
6262
}
@@ -65,7 +65,7 @@ import UIKit
6565
@IBInspectable var thirdSelectedImage: UIImage? {
6666
didSet {
6767
if let image = thirdSelectedImage {
68-
var tabBarItems = self.tabBar.items as [UITabBarItem]!
68+
var tabBarItems = self.tabBar.items as [UITabBarItem]?
6969
tabBarItems?[2].selectedImage = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
7070
}
7171
}
@@ -74,7 +74,7 @@ import UIKit
7474
@IBInspectable var fourthSelectedImage: UIImage? {
7575
didSet {
7676
if let image = fourthSelectedImage {
77-
var tabBarItems = self.tabBar.items as [UITabBarItem]!
77+
var tabBarItems = self.tabBar.items as [UITabBarItem]?
7878
tabBarItems?[3].selectedImage = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
7979
}
8080
}
@@ -83,18 +83,19 @@ import UIKit
8383
@IBInspectable var fifthSelectedImage: UIImage? {
8484
didSet {
8585
if let image = fifthSelectedImage {
86-
var tabBarItems = self.tabBar.items as [UITabBarItem]!
86+
var tabBarItems = self.tabBar.items as [UITabBarItem]?
8787
tabBarItems?[4].selectedImage = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
8888
}
8989
}
9090
}
9191

9292
override func viewDidLoad() {
9393
super.viewDidLoad()
94-
95-
for item in self.tabBar.items as [UITabBarItem]! {
96-
if let image = item.image {
97-
item.image = image.imageWithColor(tintColor: self.normalTint).withRenderingMode(UIImage.RenderingMode.alwaysOriginal)
94+
if let items = self.tabBar.items {
95+
for item in items {
96+
if let image = item.image {
97+
item.image = image.imageWithColor(tintColor: self.normalTint).withRenderingMode(UIImage.RenderingMode.alwaysOriginal)
98+
}
9899
}
99100
}
100101
}

‎Spring/Misc.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import UIKit
2424

2525
public extension String {
26-
public var length: Int { return self.characters.count }
26+
var length: Int { return self.count }
2727

28-
public func toURL() -> NSURL? {
28+
func toURL() -> NSURL? {
2929
return NSURL(string: self)
3030
}
3131
}
@@ -73,7 +73,7 @@ public extension UIColor {
7373
let scanner = Scanner(string: hex)
7474
var hexValue: CUnsignedLongLong = 0
7575
if scanner.scanHexInt64(&hexValue) {
76-
switch (hex.characters.count) {
76+
switch (hex.count) {
7777
case 3:
7878
red = CGFloat((hexValue & 0xF00) >> 8) / 15.0
7979
green = CGFloat((hexValue & 0x0F0) >> 4) / 15.0

‎SpringApp.xcodeproj/project.pbxproj

+13-20
Original file line numberDiff line numberDiff line change
@@ -413,20 +413,20 @@
413413
TargetAttributes = {
414414
1A4FDA321A6E44780099D309 = {
415415
CreatedOnToolsVersion = 6.1.1;
416-
LastSwiftMigration = 0900;
416+
LastSwiftMigration = 1020;
417417
};
418418
1A4FDA3C1A6E44780099D309 = {
419419
CreatedOnToolsVersion = 6.1.1;
420-
LastSwiftMigration = 0900;
420+
LastSwiftMigration = 1020;
421421
TestTargetID = 9641173A1A5BE90A000E3A5A;
422422
};
423423
9641173A1A5BE90A000E3A5A = {
424424
CreatedOnToolsVersion = 6.2;
425-
LastSwiftMigration = 0900;
425+
LastSwiftMigration = 1020;
426426
};
427427
9641174F1A5BE90A000E3A5A = {
428428
CreatedOnToolsVersion = 6.2;
429-
LastSwiftMigration = 0900;
429+
LastSwiftMigration = 1020;
430430
TestTargetID = 9641173A1A5BE90A000E3A5A;
431431
};
432432
};
@@ -436,6 +436,7 @@
436436
developmentRegion = English;
437437
hasScannedForEncodings = 0;
438438
knownRegions = (
439+
English,
439440
en,
440441
Base,
441442
);
@@ -615,8 +616,7 @@
615616
PRODUCT_BUNDLE_IDENTIFIER = "designcode.$(PRODUCT_NAME:rfc1034identifier)";
616617
PRODUCT_NAME = "$(TARGET_NAME)";
617618
SKIP_INSTALL = YES;
618-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
619-
SWIFT_VERSION = 4.2;
619+
SWIFT_VERSION = 5.0;
620620
TARGETED_DEVICE_FAMILY = "1,2";
621621
VERSIONING_SYSTEM = "apple-generic";
622622
VERSION_INFO_PREFIX = "";
@@ -640,8 +640,7 @@
640640
PRODUCT_NAME = "$(TARGET_NAME)";
641641
SKIP_INSTALL = YES;
642642
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
643-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
644-
SWIFT_VERSION = 4.2;
643+
SWIFT_VERSION = 5.0;
645644
TARGETED_DEVICE_FAMILY = "1,2";
646645
VERSIONING_SYSTEM = "apple-generic";
647646
VERSION_INFO_PREFIX = "";
@@ -660,8 +659,7 @@
660659
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
661660
PRODUCT_BUNDLE_IDENTIFIER = "com.jamztang.$(PRODUCT_NAME:rfc1034identifier)";
662661
PRODUCT_NAME = "$(TARGET_NAME)";
663-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
664-
SWIFT_VERSION = 4.0;
662+
SWIFT_VERSION = 5.0;
665663
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SpringApp.app/SpringApp";
666664
};
667665
name = Debug;
@@ -675,8 +673,7 @@
675673
PRODUCT_BUNDLE_IDENTIFIER = "com.jamztang.$(PRODUCT_NAME:rfc1034identifier)";
676674
PRODUCT_NAME = "$(TARGET_NAME)";
677675
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
678-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
679-
SWIFT_VERSION = 4.0;
676+
SWIFT_VERSION = 5.0;
680677
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SpringApp.app/SpringApp";
681678
};
682679
name = Release;
@@ -788,8 +785,7 @@
788785
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
789786
PRODUCT_BUNDLE_IDENTIFIER = "designcode.$(PRODUCT_NAME:rfc1034identifier)";
790787
PRODUCT_NAME = "$(TARGET_NAME)";
791-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
792-
SWIFT_VERSION = 4.2;
788+
SWIFT_VERSION = 5.0;
793789
TARGETED_DEVICE_FAMILY = "1,2";
794790
};
795791
name = Debug;
@@ -804,8 +800,7 @@
804800
PRODUCT_BUNDLE_IDENTIFIER = "designcode.$(PRODUCT_NAME:rfc1034identifier)";
805801
PRODUCT_NAME = "$(TARGET_NAME)";
806802
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
807-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
808-
SWIFT_VERSION = 4.2;
803+
SWIFT_VERSION = 5.0;
809804
TARGETED_DEVICE_FAMILY = "1,2";
810805
};
811806
name = Release;
@@ -822,8 +817,7 @@
822817
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
823818
PRODUCT_BUNDLE_IDENTIFIER = "designcode.$(PRODUCT_NAME:rfc1034identifier)";
824819
PRODUCT_NAME = "$(TARGET_NAME)";
825-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
826-
SWIFT_VERSION = 4.0;
820+
SWIFT_VERSION = 5.0;
827821
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SpringApp.app/SpringApp";
828822
};
829823
name = Debug;
@@ -837,8 +831,7 @@
837831
PRODUCT_BUNDLE_IDENTIFIER = "designcode.$(PRODUCT_NAME:rfc1034identifier)";
838832
PRODUCT_NAME = "$(TARGET_NAME)";
839833
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
840-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
841-
SWIFT_VERSION = 4.0;
834+
SWIFT_VERSION = 5.0;
842835
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SpringApp.app/SpringApp";
843836
};
844837
name = Release;

0 commit comments

Comments
 (0)