Skip to content

Commit d456193

Browse files
Swift 3.0 (Xcode 8 b6): update example project
1 parent 9cab264 commit d456193

File tree

3 files changed

+26
-18
lines changed

3 files changed

+26
-18
lines changed

Example/WSTagsFieldExample.xcodeproj/project.pbxproj

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,12 @@
145145
isa = PBXProject;
146146
attributes = {
147147
LastSwiftUpdateCheck = 0730;
148-
LastUpgradeCheck = 0730;
148+
LastUpgradeCheck = 0800;
149149
ORGANIZATIONNAME = Whitesmith;
150150
TargetAttributes = {
151151
D7F33FF11D2A7378003F0082 = {
152152
CreatedOnToolsVersion = 7.3.1;
153+
LastSwiftMigration = 0800;
153154
};
154155
};
155156
};
@@ -261,8 +262,10 @@
261262
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
262263
CLANG_WARN_EMPTY_BODY = YES;
263264
CLANG_WARN_ENUM_CONVERSION = YES;
265+
CLANG_WARN_INFINITE_RECURSION = YES;
264266
CLANG_WARN_INT_CONVERSION = YES;
265267
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
268+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
266269
CLANG_WARN_UNREACHABLE_CODE = YES;
267270
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
268271
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -306,8 +309,10 @@
306309
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
307310
CLANG_WARN_EMPTY_BODY = YES;
308311
CLANG_WARN_ENUM_CONVERSION = YES;
312+
CLANG_WARN_INFINITE_RECURSION = YES;
309313
CLANG_WARN_INT_CONVERSION = YES;
310314
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
315+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
311316
CLANG_WARN_UNREACHABLE_CODE = YES;
312317
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
313318
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -326,31 +331,34 @@
326331
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
327332
MTL_ENABLE_DEBUG_INFO = NO;
328333
SDKROOT = iphoneos;
334+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
329335
VALIDATE_PRODUCT = YES;
330336
};
331337
name = Release;
332338
};
333339
D7F340051D2A7378003F0082 /* Debug */ = {
334340
isa = XCBuildConfiguration;
335341
buildSettings = {
342+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
336343
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
337-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
338344
INFOPLIST_FILE = WSTagsFieldExample/Info.plist;
339345
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
340346
PRODUCT_BUNDLE_IDENTIFIER = co.whitesmith.WSTagsFieldExample;
341347
PRODUCT_NAME = "$(TARGET_NAME)";
348+
SWIFT_VERSION = 3.0;
342349
};
343350
name = Debug;
344351
};
345352
D7F340061D2A7378003F0082 /* Release */ = {
346353
isa = XCBuildConfiguration;
347354
buildSettings = {
355+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
348356
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
349-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
350357
INFOPLIST_FILE = WSTagsFieldExample/Info.plist;
351358
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
352359
PRODUCT_BUNDLE_IDENTIFIER = co.whitesmith.WSTagsFieldExample;
353360
PRODUCT_NAME = "$(TARGET_NAME)";
361+
SWIFT_VERSION = 3.0;
354362
};
355363
name = Release;
356364
};

Example/WSTagsFieldExample/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1313

1414
var window: UIWindow?
1515

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

Example/WSTagsFieldExample/ViewController.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import WSTagsField
1212
class ViewController: UIViewController {
1313

1414
let tagsField = WSTagsField()
15-
let testButton = UIButton(type: .System)
15+
let testButton = UIButton(type: .system)
1616

1717
override func viewDidLoad() {
1818
super.viewDidLoad()
19-
view.backgroundColor = .redColor()
19+
view.backgroundColor = .red
2020
tagsField.placeholder = "Enter a tag"
21-
tagsField.backgroundColor = .whiteColor()
21+
tagsField.backgroundColor = .white
2222
tagsField.frame = CGRect(x: 0, y: 44, width: 200, height: 44)
2323
view.addSubview(tagsField)
2424

@@ -48,26 +48,26 @@ class ViewController: UIViewController {
4848
}
4949

5050
testButton.frame = CGRect(x: 0, y: 250, width: 100, height: 44)
51-
testButton.backgroundColor = .whiteColor()
52-
testButton.setTitle("Test", forState: .Normal)
51+
testButton.backgroundColor = .white
52+
testButton.setTitle("Test", for: UIControlState())
5353
view.addSubview(testButton)
54-
testButton.addTarget(self, action: #selector(didTouchTestButton), forControlEvents: .TouchUpInside)
54+
testButton.addTarget(self, action: #selector(didTouchTestButton), for: .touchUpInside)
5555
}
5656

57-
func didTouchTestButton(sender: AnyObject) {
57+
func didTouchTestButton(_ sender: AnyObject) {
5858
tagsField.padding = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
5959
tagsField.spaceBetweenTags = 10.0
60-
tagsField.font = .systemFontOfSize(12.0)
61-
tagsField.tintColor = .greenColor()
62-
tagsField.textColor = .blackColor()
63-
tagsField.fieldTextColor = .blueColor()
64-
tagsField.selectedColor = .blackColor()
65-
tagsField.selectedTextColor = .redColor()
60+
tagsField.font = .systemFont(ofSize: 12.0)
61+
tagsField.tintColor = .green
62+
tagsField.textColor = .black
63+
tagsField.fieldTextColor = .blue
64+
tagsField.selectedColor = .black
65+
tagsField.selectedTextColor = .red
6666
tagsField.delimiter = ","
6767
print(tagsField.tags)
6868
}
6969

70-
override func viewDidAppear(animated: Bool) {
70+
override func viewDidAppear(_ animated: Bool) {
7171
if tagsField.isEditing == false {
7272
tagsField.beginEditing()
7373
}

0 commit comments

Comments
 (0)