Skip to content

Commit

Permalink
Update to Swift 5, Xcode 10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Electric Bolt committed Apr 18, 2019
1 parent 7b1843b commit d23521b
Show file tree
Hide file tree
Showing 25 changed files with 85 additions and 66 deletions.
7 changes: 6 additions & 1 deletion BindKit/BindKit.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
747B7DD02044A45B002BD36E /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0920;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = "Electric Bolt Limited";
TargetAttributes = {
747B7DD72044A45B002BD36E = {
Expand All @@ -330,6 +330,7 @@
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 747B7DCF2044A45B002BD36E;
productRefGroup = 747B7DD92044A45B002BD36E /* Products */;
Expand Down Expand Up @@ -434,13 +435,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -493,13 +496,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down
2 changes: 1 addition & 1 deletion BindKit/BindKit/private/NSObject+EBKBinding.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
NSString* EBKBindingException = @"EBKBindingException";

NSString* EBKVersion(void) {
return @"1.0.0";
return @"1.0.1";
}

@implementation NSObject (EBKBinding)
Expand Down
17 changes: 11 additions & 6 deletions BindingExample/BindingExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,16 +247,17 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 0920;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = "Electric Bolt Limited";
TargetAttributes = {
747B7E3A2044B06C002BD36E = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 0830;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
749ECA9C2057A2CB00D3706B = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
TestTargetID = 747B7E3A2044B06C002BD36E;
};
Expand Down Expand Up @@ -383,13 +384,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -440,13 +443,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -494,7 +499,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "BindingExample/BindingExample-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
Expand All @@ -516,7 +521,7 @@
PRODUCT_BUNDLE_IDENTIFIER = nz.co.electricbolt.BindingExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "BindingExample/BindingExample-Bridging-Header.h";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
Expand All @@ -533,7 +538,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = nz.co.electricbolt.BindingExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BindingExample.app/BindingExample";
};
Expand All @@ -551,7 +556,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = nz.co.electricbolt.BindingExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BindingExample.app/BindingExample";
};
Expand Down
2 changes: 1 addition & 1 deletion BindingExample/BindingExample/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
return true
}

Expand Down
2 changes: 1 addition & 1 deletion BindingExample/BindingExample/AttrStr.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class AttrStr {
if buf.length > 0 {
buf.append(NSAttributedString(string: " "))
}
buf.append(NSAttributedString(string: "\(key)=", attributes: [NSFontAttributeName: UIFont.boldSystemFont(ofSize: 14.0)]))
buf.append(NSAttributedString(string: "\(key)=", attributes: [NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 14.0)]))
return self
}

Expand Down
2 changes: 1 addition & 1 deletion BindingExample/BindingExample/Colorize.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Foundation
func colorize(_ s : String) -> NSAttributedString {
let s = NSMutableAttributedString(string: s)
for i in 0 ..< s.length {
s.setAttributes([NSForegroundColorAttributeName: UIColor(red: CGFloat(drand48()), green: CGFloat(drand48()), blue: CGFloat(drand48()), alpha: 1.0)],
s.setAttributes([NSAttributedString.Key.foregroundColor: UIColor(red: CGFloat(drand48()), green: CGFloat(drand48()), blue: CGFloat(drand48()), alpha: 1.0)],
range: NSMakeRange(i, 1))
}
return s
Expand Down
2 changes: 1 addition & 1 deletion BindingExample/BindingExample/MySearchBarCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Foundation

fileprivate class Model: NSObject {

dynamic var text: String!
@objc dynamic var text: String!

override init() {
super.init()
Expand Down
2 changes: 1 addition & 1 deletion BindingExample/BindingExample/RegistrationCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class RegistrationCtrl: UITableViewController {
@IBOutlet weak var furniture: UISwitch!
@IBOutlet weak var doneButton: UIBarButtonItem!

var model = RegistrationModel()
@objc var model = RegistrationModel()

override func viewDidLoad() {
model.bindKey(#keyPath(model.firstName), view: firstName, viewKey: UITextFieldText)
Expand Down
18 changes: 9 additions & 9 deletions BindingExample/BindingExample/RegistrationModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ import Foundation

class RegistrationModel: NSObject {

dynamic var firstName: String?
dynamic var lastName: String?
dynamic var email: String?
dynamic var inputAge: Double {
@objc dynamic var firstName: String?
@objc dynamic var lastName: String?
@objc dynamic var email: String?
@objc dynamic var inputAge: Double {
didSet {
actualAge = String(format: "%.0f", inputAge);
}
}
dynamic var actualAge: String?
dynamic var subscribeAutomobile: Bool
dynamic var subscribeElectronics: Bool
dynamic var subscribeFurniture: Bool
dynamic var done: Bool
@objc dynamic var actualAge: String?
@objc dynamic var subscribeAutomobile: Bool
@objc dynamic var subscribeElectronics: Bool
@objc dynamic var subscribeFurniture: Bool
@objc dynamic var done: Bool

override init() {
firstName = ""
Expand Down
2 changes: 1 addition & 1 deletion BindingExample/BindingExample/UIBarButtonItemCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Foundation

fileprivate class Model: NSObject {

dynamic var enabled: Bool = true
@objc dynamic var enabled: Bool = true

func calculated() -> NSAttributedString {
return AttrStr()
Expand Down
4 changes: 2 additions & 2 deletions BindingExample/BindingExample/UIButtonCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import Foundation

fileprivate class Model: NSObject {

dynamic var enabled: Bool = true
dynamic var hidden: Bool = false
@objc dynamic var enabled: Bool = true
@objc dynamic var hidden: Bool = false

func calculated() -> NSAttributedString {
return AttrStr()
Expand Down
6 changes: 3 additions & 3 deletions BindingExample/BindingExample/UIDatePickerCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import Foundation

fileprivate class Model: NSObject {

dynamic var date: NSDate? = NSDate()
dynamic var enabled: Bool = true
dynamic var hidden: Bool = false
@objc dynamic var date: NSDate? = NSDate()
@objc dynamic var enabled: Bool = true
@objc dynamic var hidden: Bool = false

func calculated() -> NSAttributedString {
return AttrStr()
Expand Down
4 changes: 2 additions & 2 deletions BindingExample/BindingExample/UIImageViewCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import Foundation

fileprivate class Model: NSObject {

dynamic var image: UIImage! = UIImage(named: "cat.png")
dynamic var hidden: Bool = false
@objc dynamic var image: UIImage! = UIImage(named: "cat.png")
@objc dynamic var hidden: Bool = false

func calculated() -> NSAttributedString {
return AttrStr()
Expand Down
6 changes: 3 additions & 3 deletions BindingExample/BindingExample/UILabelCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import Foundation
fileprivate class Model: NSObject {

var segueBindTextProperty: Bool = false
dynamic var text: String!
dynamic var attributedText: NSAttributedString!
dynamic var hidden: Bool = false
@objc dynamic var text: String!
@objc dynamic var attributedText: NSAttributedString!
@objc dynamic var hidden: Bool = false

override init() {
super.init()
Expand Down
8 changes: 4 additions & 4 deletions BindingExample/BindingExample/UIPageControlCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import Foundation

fileprivate class Model: NSObject {

dynamic var enabled: Bool = true
dynamic var hidden: Bool = false
dynamic var currentPage: Int = 0
dynamic var numberOfPages: Int = 1
@objc dynamic var enabled: Bool = true
@objc dynamic var hidden: Bool = false
@objc dynamic var currentPage: Int = 0
@objc dynamic var numberOfPages: Int = 1

func calculated() -> NSAttributedString {
return AttrStr()
Expand Down
6 changes: 3 additions & 3 deletions BindingExample/BindingExample/UISegmentedControlCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import Foundation

fileprivate class Model: NSObject {

dynamic var enabled: Bool = true
dynamic var hidden: Bool = false
dynamic var selectedSegmentIndex: Int = 0
@objc dynamic var enabled: Bool = true
@objc dynamic var hidden: Bool = false
@objc dynamic var selectedSegmentIndex: Int = 0

func calculated() -> NSAttributedString {
return AttrStr()
Expand Down
6 changes: 3 additions & 3 deletions BindingExample/BindingExample/UISliderCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import Foundation

fileprivate class Model: NSObject {

dynamic var enabled: Bool = true
dynamic var hidden: Bool = false
dynamic var value: Float = 0
@objc dynamic var enabled: Bool = true
@objc dynamic var hidden: Bool = false
@objc dynamic var value: Float = 0

func calculated() -> NSAttributedString {
return AttrStr()
Expand Down
6 changes: 3 additions & 3 deletions BindingExample/BindingExample/UIStepperCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import Foundation

fileprivate class Model: NSObject {

dynamic var enabled: Bool = true
dynamic var hidden: Bool = false
dynamic var value: Double = 0.0
@objc dynamic var enabled: Bool = true
@objc dynamic var hidden: Bool = false
@objc dynamic var value: Double = 0.0

func calculated() -> NSAttributedString {
return AttrStr()
Expand Down
6 changes: 3 additions & 3 deletions BindingExample/BindingExample/UISwitch.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import Foundation

fileprivate class Model: NSObject {

dynamic var enabled: Bool = true
dynamic var hidden: Bool = false
dynamic var onOff: Bool = false
@objc dynamic var enabled: Bool = true
@objc dynamic var hidden: Bool = false
@objc dynamic var onOff: Bool = false

func calculated() -> NSAttributedString {
return AttrStr()
Expand Down
8 changes: 4 additions & 4 deletions BindingExample/BindingExample/UITextFieldCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import Foundation
fileprivate class Model: NSObject {

var segueBindTextProperty: Bool = false
dynamic var text: String!
dynamic var attributedText: NSAttributedString!
dynamic var enabled: Bool = true
dynamic var hidden: Bool = false
@objc dynamic var text: String!
@objc dynamic var attributedText: NSAttributedString!
@objc dynamic var enabled: Bool = true
@objc dynamic var hidden: Bool = false

override init() {
super.init()
Expand Down
8 changes: 4 additions & 4 deletions BindingExample/BindingExample/UITextViewCtrl.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import Foundation
fileprivate class Model: NSObject {

var segueBindTextProperty: Bool = false
dynamic var text: String!
dynamic var attributedText: NSAttributedString!
dynamic var editable: Bool = true
dynamic var hidden: Bool = false
@objc dynamic var text: String!
@objc dynamic var attributedText: NSAttributedString!
@objc dynamic var editable: Bool = true
@objc dynamic var hidden: Bool = false

override init() {
super.init()
Expand Down
Loading

0 comments on commit d23521b

Please sign in to comment.