Skip to content

Commit bdc157f

Browse files
wylogphwylogph
committed
chore(source code): updated to swift 3
1 parent 1446a70 commit bdc157f

18 files changed

+302
-223
lines changed

‎NDForm.xcodeproj/project.pbxproj

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -263,21 +263,24 @@
263263
isa = PBXProject;
264264
attributes = {
265265
LastSwiftUpdateCheck = 0720;
266-
LastUpgradeCheck = 0720;
266+
LastUpgradeCheck = 0830;
267267
ORGANIZATIONNAME = locomoviles.com;
268268
TargetAttributes = {
269269
4512F6F41C438F7F006659A0 = {
270270
CreatedOnToolsVersion = 7.2;
271271
DevelopmentTeam = 254KHU449R;
272+
LastSwiftMigration = 0830;
272273
TestTargetID = 4551A5EC1C3649D40084588C;
273274
};
274275
4551A5EC1C3649D40084588C = {
275276
CreatedOnToolsVersion = 7.2;
276277
DevelopmentTeam = 254KHU449R;
278+
LastSwiftMigration = 0830;
277279
};
278280
457023851C3F7DA700DBEC23 = {
279281
CreatedOnToolsVersion = 7.2;
280282
DevelopmentTeam = 254KHU449R;
283+
LastSwiftMigration = 0830;
281284
};
282285
};
283286
};
@@ -412,7 +415,7 @@
412415
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
413416
PRODUCT_BUNDLE_IDENTIFIER = com.naz.NDFormTests;
414417
PRODUCT_NAME = "$(TARGET_NAME)";
415-
SWIFT_VERSION = 2.3;
418+
SWIFT_VERSION = 3.0;
416419
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NDForm.app/NDForm";
417420
};
418421
name = Debug;
@@ -426,7 +429,7 @@
426429
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
427430
PRODUCT_BUNDLE_IDENTIFIER = com.naz.NDFormTests;
428431
PRODUCT_NAME = "$(TARGET_NAME)";
429-
SWIFT_VERSION = 2.3;
432+
SWIFT_VERSION = 3.0;
430433
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NDForm.app/NDForm";
431434
};
432435
name = Release;
@@ -444,8 +447,10 @@
444447
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
445448
CLANG_WARN_EMPTY_BODY = YES;
446449
CLANG_WARN_ENUM_CONVERSION = YES;
450+
CLANG_WARN_INFINITE_RECURSION = YES;
447451
CLANG_WARN_INT_CONVERSION = YES;
448452
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
453+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
449454
CLANG_WARN_UNREACHABLE_CODE = YES;
450455
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
451456
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -488,8 +493,10 @@
488493
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
489494
CLANG_WARN_EMPTY_BODY = YES;
490495
CLANG_WARN_ENUM_CONVERSION = YES;
496+
CLANG_WARN_INFINITE_RECURSION = YES;
491497
CLANG_WARN_INT_CONVERSION = YES;
492498
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
499+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
493500
CLANG_WARN_UNREACHABLE_CODE = YES;
494501
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
495502
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -508,16 +515,17 @@
508515
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
509516
MTL_ENABLE_DEBUG_INFO = NO;
510517
SDKROOT = iphoneos;
518+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
511519
VALIDATE_PRODUCT = YES;
512520
};
513521
name = Release;
514522
};
515523
4551A6001C3649D40084588C /* Debug */ = {
516524
isa = XCBuildConfiguration;
517525
buildSettings = {
526+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
518527
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
519528
DEVELOPMENT_TEAM = 254KHU449R;
520-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
521529
FRAMEWORK_SEARCH_PATHS = (
522530
"$(inherited)",
523531
"$(PROJECT_DIR)/FormValidationKit/build/Debug-iphoneos",
@@ -527,16 +535,16 @@
527535
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
528536
PRODUCT_BUNDLE_IDENTIFIER = com.naz.NDForm;
529537
PRODUCT_NAME = "$(TARGET_NAME)";
530-
SWIFT_VERSION = 2.3;
538+
SWIFT_VERSION = 3.0;
531539
};
532540
name = Debug;
533541
};
534542
4551A6011C3649D40084588C /* Release */ = {
535543
isa = XCBuildConfiguration;
536544
buildSettings = {
545+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
537546
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
538547
DEVELOPMENT_TEAM = 254KHU449R;
539-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
540548
FRAMEWORK_SEARCH_PATHS = (
541549
"$(inherited)",
542550
"$(PROJECT_DIR)/FormValidationKit/build/Debug-iphoneos",
@@ -546,15 +554,15 @@
546554
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
547555
PRODUCT_BUNDLE_IDENTIFIER = com.naz.NDForm;
548556
PRODUCT_NAME = "$(TARGET_NAME)";
549-
SWIFT_VERSION = 2.3;
557+
SWIFT_VERSION = 3.0;
550558
};
551559
name = Release;
552560
};
553561
457023901C3F7DA700DBEC23 /* Debug */ = {
554562
isa = XCBuildConfiguration;
555563
buildSettings = {
556564
CLANG_ENABLE_MODULES = YES;
557-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
565+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
558566
CURRENT_PROJECT_VERSION = 1;
559567
DEFINES_MODULE = YES;
560568
DEVELOPMENT_TEAM = 254KHU449R;
@@ -569,7 +577,7 @@
569577
PRODUCT_NAME = "$(TARGET_NAME)";
570578
SKIP_INSTALL = YES;
571579
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
572-
SWIFT_VERSION = 2.3;
580+
SWIFT_VERSION = 3.0;
573581
TARGETED_DEVICE_FAMILY = "1,2";
574582
VERSIONING_SYSTEM = "apple-generic";
575583
VERSION_INFO_PREFIX = "";
@@ -580,6 +588,7 @@
580588
isa = XCBuildConfiguration;
581589
buildSettings = {
582590
CLANG_ENABLE_MODULES = YES;
591+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
583592
CURRENT_PROJECT_VERSION = 1;
584593
DEFINES_MODULE = YES;
585594
DEVELOPMENT_TEAM = 254KHU449R;
@@ -593,7 +602,7 @@
593602
PRODUCT_BUNDLE_IDENTIFIER = com.ex.NDFormKit;
594603
PRODUCT_NAME = "$(TARGET_NAME)";
595604
SKIP_INSTALL = YES;
596-
SWIFT_VERSION = 2.3;
605+
SWIFT_VERSION = 3.0;
597606
TARGETED_DEVICE_FAMILY = "1,2";
598607
VERSIONING_SYSTEM = "apple-generic";
599608
VERSION_INFO_PREFIX = "";

‎NDForm.xcodeproj/xcuserdata/nazariomariano.xcuserdatad/xcschemes/NDForm.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "0830"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎NDForm/AppDelegate.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}
2121

22-
func applicationWillResignActive(application: UIApplication) {
22+
func applicationWillResignActive(_ application: UIApplication) {
2323
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
2424
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
2525
}
2626

27-
func applicationDidEnterBackground(application: UIApplication) {
27+
func applicationDidEnterBackground(_ application: UIApplication) {
2828
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
2929
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
3030
}
3131

32-
func applicationWillEnterForeground(application: UIApplication) {
32+
func applicationWillEnterForeground(_ application: UIApplication) {
3333
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
3434
}
3535

36-
func applicationDidBecomeActive(application: UIApplication) {
36+
func applicationDidBecomeActive(_ application: UIApplication) {
3737
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
3838
}
3939

40-
func applicationWillTerminate(application: UIApplication) {
40+
func applicationWillTerminate(_ application: UIApplication) {
4141
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
4242
}
4343

‎NDForm/NDFormSwitchFieldCell.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ class NDFormSwitchFieldCell: NDFormTableViewCell {
1313

1414
@IBOutlet weak var switchButton: UISwitch!
1515

16-
@IBAction func didSwitch(sender: AnyObject) {
17-
self.fieldData().setValue(switchButton.on)
16+
@IBAction func didSwitch(_ sender: AnyObject) {
17+
self.fieldData().setValue(switchButton.isOn as AnyObject)
1818
displayBoolState()
1919
}
2020

21-
override func setDisplayValue(forObject: NDDataWrapper) {
21+
override func setDisplayValue(_ forObject: NDDataWrapper) {
2222
displayBoolState()
2323
}
2424

@@ -30,10 +30,10 @@ class NDFormSwitchFieldCell: NDFormTableViewCell {
3030
}else{
3131
titleLabel.text = fieldData().fieldTitle + "\("(OFF)")"
3232
}
33-
switchButton.on = switched
33+
switchButton.isOn = switched
3434
}else{
3535
titleLabel.text = fieldData().fieldTitle + "\("(OFF)")"
36-
switchButton.on = false
36+
switchButton.isOn = false
3737
}
3838
}
3939
}

‎NDForm/NDFormTableViewCell.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,32 @@
99
import UIKit
1010
import NDFormKit
1111

12-
public class NDFormTableViewCell: UITableViewCell {
13-
private var _fieldData: NDDataWrapper!
12+
open class NDFormTableViewCell: UITableViewCell {
13+
fileprivate var _fieldData: NDDataWrapper!
1414
@IBOutlet weak var titleLabel: UILabel!
1515

16-
override public func awakeFromNib() {
16+
override open func awakeFromNib() {
1717
super.awakeFromNib()
1818
// Initialization code
1919
}
2020

21-
override public func setSelected(selected: Bool, animated: Bool) {
21+
override open func setSelected(_ selected: Bool, animated: Bool) {
2222
super.setSelected(selected, animated: animated)
2323
}
2424

2525
func onCellDisplay() {
2626

2727
}
2828

29-
public func setDisplayValue(forObject: NDDataWrapper) {
29+
open func setDisplayValue(_ forObject: NDDataWrapper) {
3030

3131
}
3232

33-
public func setFieldData(simpleData: NDDataWrapper) {
33+
open func setFieldData(_ simpleData: NDDataWrapper) {
3434
_fieldData = simpleData
3535
}
3636

37-
public func fieldData() -> NDDataWrapper {
37+
open func fieldData() -> NDDataWrapper {
3838
return _fieldData
3939
}
4040
}

‎NDForm/NDFormTextFieldCell.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,41 @@ class NDFormTextFieldCell: NDFormTableViewCell {
1313

1414
@IBOutlet weak var textField: UITextField!
1515

16-
func textFieldBegunEditing(textField: UITextField) {
16+
func textFieldBegunEditing(_ textField: UITextField) {
1717
titleLabel.textColor = titleLabel.tintColor
1818
}
1919

20-
func textFieldDidEndEditing(textField: UITextField) {
21-
titleLabel.textColor = UIColor.blackColor()
20+
func textFieldDidEndEditing(_ textField: UITextField) {
21+
titleLabel.textColor = UIColor.black
2222

2323
let text = textField.text
2424

2525
if text!.isEmpty {
26-
titleLabel.textColor = UIColor.redColor()
26+
titleLabel.textColor = UIColor.red
2727
}
2828
}
2929

3030
override func awakeFromNib() {
3131
super.awakeFromNib()
3232
}
3333

34-
@IBAction func isChangingText(sender: AnyObject) {
34+
@IBAction func isChangingText(_ sender: AnyObject) {
3535
let text = textField.text
3636

3737
if text!.isEmpty {
3838
self.fieldData().setValue(nil)
3939
}else{
40-
self.fieldData().setValue(text)
40+
self.fieldData().setValue(text as AnyObject)
4141
}
4242
//replace with delegate pattern
4343

4444
}
4545

46-
override func setSelected(selected: Bool, animated: Bool) {
46+
override func setSelected(_ selected: Bool, animated: Bool) {
4747
super.setSelected(selected, animated: animated)
4848
}
4949

50-
override func setDisplayValue(forObject: NDDataWrapper) {
50+
override func setDisplayValue(_ forObject: NDDataWrapper) {
5151
self.textField.text = forObject.displayText()
5252
}
5353
}

‎NDForm/ValueToStringTransformer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import UIKit
1010
import NDFormKit
1111

1212
class ValueToStringTransformer: NSObject, NDValueToStringTransformer {
13-
func toString(value: AnyObject?) -> String {
13+
func toString(_ value: AnyObject?) -> String {
1414
if value != nil {
1515
return value as! String
1616
}else{

0 commit comments

Comments
 (0)